From e30960832f71023c27522c44a5e2df34d1c80a6c Mon Sep 17 00:00:00 2001
From: luiger <luiger852@gmail.com>
Date: Mon, 24 Mar 2025 12:42:46 -0400
Subject: [PATCH 001/291] change password

---
 package-lock.json                    | 294 +++------------------------
 src/app/_layout.tsx                  |   4 +
 src/app/change-password.tsx          |   2 +
 src/screens/PasswordChangeScreen.tsx | 200 ++++++++++++++++++
 4 files changed, 239 insertions(+), 261 deletions(-)
 create mode 100644 src/app/change-password.tsx
 create mode 100644 src/screens/PasswordChangeScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index 6f40801..0df9982 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -379,12 +379,12 @@
       }
     },
     "node_modules/@babel/helpers": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.9.tgz",
-      "integrity": "sha512-Mz/4+y8udxBKdmzt/UjPACs4G3j5SshJJEFFKxlCGPydG4JAHXxjWjAwjd09tf6oINvl1VfMJo+nB7H2YKQ0dA==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/helpers/-/helpers-7.26.10.tgz",
+      "integrity": "sha512-UPYc3SauzZ3JGgj87GgZ89JVdC5dj0AoetR5Bw6wj4niittNyFh6+eOGonYvJ1ao6B8lEa3Q3klS7ADZ53bc5g==",
       "dependencies": {
         "@babel/template": "^7.26.9",
-        "@babel/types": "^7.26.9"
+        "@babel/types": "^7.26.10"
       },
       "engines": {
         "node": ">=6.9.0"
@@ -2000,9 +2000,9 @@
       }
     },
     "node_modules/@babel/runtime": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.9.tgz",
-      "integrity": "sha512-aA63XwOkcl4xxQa3HjPMqOP6LiK0ZDv3mUPYEFXkpHbaFjtGggE1A61FjFzJnB+p7/oy2gA8E+rcBNl/zC1tMg==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.26.10.tgz",
+      "integrity": "sha512-2WJMeRQPHKSPemqk/awGrAiuFfzBmOIPXKizAsVhWH9YJqLZ0H+HS4c8loHGgW6utJ3E/ejXQUsiGaQy2NZ9Fw==",
       "dependencies": {
         "regenerator-runtime": "^0.14.0"
       },
@@ -2075,9 +2075,9 @@
       }
     },
     "node_modules/@babel/types": {
-      "version": "7.26.9",
-      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.9.tgz",
-      "integrity": "sha512-Y3IR1cRnOxOCDvMmNiym7XpXQ93iGDDPHx+Zj+NM+rg0fBaShfQLkg+hKPaZCEvg5N/LeCo4+Rj/i3FuJsIQaw==",
+      "version": "7.26.10",
+      "resolved": "https://registry.npmjs.org/@babel/types/-/types-7.26.10.tgz",
+      "integrity": "sha512-emqcG3vHrpxUKTrxcblR36dcrcoRDvKmnL/dCL6ZsHaShW80qxCAcNhzQZrpeM765VzEos+xOi4s+r4IXzTwdQ==",
       "dependencies": {
         "@babel/helper-string-parser": "^7.25.9",
         "@babel/helper-validator-identifier": "^7.25.9"
@@ -2843,15 +2843,14 @@
       "integrity": "sha512-Doz2bfiPndXYFPMRwPyGa1k5QaKDVpY806UJj570epIiMzWaYyCtobasyfC++qfIXVb5Ocy7r3tP9d62hAQ7IQ=="
     },
     "node_modules/@expo/server": {
-      "version": "0.5.1",
-      "resolved": "https://registry.npmjs.org/@expo/server/-/server-0.5.1.tgz",
-      "integrity": "sha512-lk8pKKw0eVP6rqkDR46vQB3vLA46z4KNGrqHpjD/SvMu1cGaRmQG2cQdX44mQtG8WyO9EYau+fBMHQQS2OTFKg==",
-      "license": "MIT",
+      "version": "0.5.3",
+      "resolved": "https://registry.npmjs.org/@expo/server/-/server-0.5.3.tgz",
+      "integrity": "sha512-WXsWzeBs5v/h0PUfHyNLLz07rwwO5myQ1A5DGYewyyGLmsyl61yVCe8AgAlp1wkiMsqhj2hZqI2u3K10QnCMrQ==",
       "dependencies": {
-        "@remix-run/node": "^2.12.0",
         "abort-controller": "^3.0.0",
         "debug": "^4.3.4",
-        "source-map-support": "~0.5.21"
+        "source-map-support": "~0.5.21",
+        "undici": "^6.18.2"
       }
     },
     "node_modules/@expo/spawn-async": {
@@ -4075,132 +4074,6 @@
         "nanoid": "3.3.8"
       }
     },
-    "node_modules/@remix-run/node": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.16.0.tgz",
-      "integrity": "sha512-9yYBYCHYO1+bIScGAtOy5/r4BoTS8E5lpQmjWP99UxSCSiKHPEO76V9Z8mmmarTNis/FPN+sUwfmbQWNHLA2vw==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/server-runtime": "2.16.0",
-        "@remix-run/web-fetch": "^4.4.2",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie-signature": "^1.1.0",
-        "source-map-support": "^0.5.21",
-        "stream-slice": "^0.1.2",
-        "undici": "^6.11.1"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/router": {
-      "version": "1.23.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-      "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@remix-run/server-runtime": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.16.0.tgz",
-      "integrity": "sha512-gbuc4slxPi+pT47MrUYprX/wCuDlYL6H3LHZSvimWO1kDCBt8oefHzdHDPjLi4B1xzqXZomswTbuJzpZ7xRRTg==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/router": "1.23.0",
-        "@types/cookie": "^0.6.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie": "^0.6.0",
-        "set-cookie-parser": "^2.4.8",
-        "source-map": "^0.7.3",
-        "turbo-stream": "2.4.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/server-runtime/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@remix-run/web-blob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.1.0.tgz",
-      "integrity": "sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-stream": "^1.1.0",
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-fetch": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.2.tgz",
-      "integrity": "sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0",
-        "@remix-run/web-file": "^3.1.0",
-        "@remix-run/web-form-data": "^3.1.0",
-        "@remix-run/web-stream": "^1.1.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "abort-controller": "^3.0.0",
-        "data-uri-to-buffer": "^3.0.1",
-        "mrmime": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.17 || >=12.3"
-      }
-    },
-    "node_modules/@remix-run/web-file": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.1.0.tgz",
-      "integrity": "sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0"
-      }
-    },
-    "node_modules/@remix-run/web-form-data": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.1.0.tgz",
-      "integrity": "sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==",
-      "license": "MIT",
-      "dependencies": {
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.1.0.tgz",
-      "integrity": "sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==",
-      "license": "MIT",
-      "dependencies": {
-        "web-streams-polyfill": "^3.1.1"
-      }
-    },
     "node_modules/@segment/loosely-validate-event": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz",
@@ -4760,12 +4633,6 @@
         "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/@types/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/@types/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-4Kh9a6B2bQciAhf7FSuMRRkUWecJgJu9nPnx3yzpsfXX/c50REIqpHY4C82bXP90qrLtXtkDxTZosYO3UpOwlA==",
-      "license": "MIT"
-    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
@@ -5136,12 +5003,6 @@
         "@urql/core": "^5.0.0"
       }
     },
-    "node_modules/@web3-storage/multipart-parser": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@web3-storage/multipart-parser/-/multipart-parser-1.0.0.tgz",
-      "integrity": "sha512-BEO6al7BYqcnfX15W2cnGR+Q566ACXAT9UQykORCWW80lmkpWsnEob6zJS1ZVBKsSJC8+7vJkHwlp+lXG1UCdw==",
-      "license": "(Apache-2.0 AND MIT)"
-    },
     "node_modules/@webassemblyjs/ast": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
@@ -5309,13 +5170,6 @@
       "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
       "peer": true
     },
-    "node_modules/@zxing/text-encoding": {
-      "version": "0.9.0",
-      "resolved": "https://registry.npmjs.org/@zxing/text-encoding/-/text-encoding-0.9.0.tgz",
-      "integrity": "sha512-U/4aVJ2mxI0aDNI8Uq0wEhMgY+u4CNtEb0om3+y3+niDAsoTCOB33UF0sxpzqzdqXLqmvc+vZyAt4O8pPdfkwA==",
-      "license": "(Unlicense OR Apache-2.0)",
-      "optional": true
-    },
     "node_modules/abab": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/abab/-/abab-2.0.6.tgz",
@@ -5742,6 +5596,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -5753,10 +5608,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.1.tgz",
-      "integrity": "sha512-NN+fvwH/kV01dYUQ3PTOZns4LWtWhOFCAhQ/pHb88WQ1hNe5V/dvFwc4VJcDL11LT9xSX0QtsR8sWUuyOuOq7g==",
-      "license": "MIT",
+      "version": "1.8.4",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
+      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -6313,6 +6167,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
@@ -6342,6 +6197,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
       "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
         "get-intrinsic": "^1.2.6"
@@ -6824,24 +6680,6 @@
       "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
       "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
     },
-    "node_modules/cookie": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.6.0.tgz",
-      "integrity": "sha512-U71cyTamuh1CRNCfpGY6to28lxvNwPG4Guz/EVjgf3Jmzv0vlDp1atT9eS5dDjMYHucpHbWns6Lwf3BKz6svdw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/cookie-signature": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.2.2.tgz",
-      "integrity": "sha512-D76uU73ulSXrD1UXF4KE2TMxVVwhsnCgfAyTg9k8P6KGZjlXKrOLe4dJQKI3Bxi5wjesZoFXJWElNWBjPZMbhg==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=6.6.0"
-      }
-    },
     "node_modules/core-js": {
       "version": "3.40.0",
       "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
@@ -7055,15 +6893,6 @@
       "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
       "devOptional": true
     },
-    "node_modules/data-uri-to-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/data-uri-to-buffer/-/data-uri-to-buffer-3.0.1.tgz",
-      "integrity": "sha512-WboRycPNsVw3B3TL559F7kuBUM4d8CgMEvk6xEJlOp7OBPjt6G7z8WMWlD2rOFZLk6OYfFIUGsCOWzcQH9K2og==",
-      "license": "MIT",
-      "engines": {
-        "node": ">= 6"
-      }
-    },
     "node_modules/data-urls": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
@@ -7261,6 +7090,7 @@
       "version": "1.1.4",
       "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
       "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0",
         "es-errors": "^1.3.0",
@@ -8875,6 +8705,7 @@
       "version": "0.3.5",
       "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
       "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "dev": true,
       "dependencies": {
         "is-callable": "^1.2.7"
       },
@@ -9275,6 +9106,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
       "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
       "dependencies": {
         "es-define-property": "^1.0.0"
       },
@@ -9699,22 +9531,6 @@
         "node": ">= 0.10"
       }
     },
-    "node_modules/is-arguments": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/is-arguments/-/is-arguments-1.2.0.tgz",
-      "integrity": "sha512-7bVbi0huj/wrIAOzb8U1aszg9kdi3KN/CyU19CTI7tAoZYEZoL9yCDXpbXN+uPsuWnP02cyug1gleqq+TU+YCA==",
-      "license": "MIT",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/is-array-buffer": {
       "version": "3.0.5",
       "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
@@ -9828,6 +9644,7 @@
       "version": "1.2.7",
       "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
       "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       },
@@ -9947,6 +9764,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
       "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "get-proto": "^1.0.0",
@@ -10043,6 +9861,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
       "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "gopd": "^1.2.0",
@@ -10128,6 +9947,7 @@
       "version": "1.1.15",
       "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
       "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dev": true,
       "dependencies": {
         "which-typed-array": "^1.1.16"
       },
@@ -12570,15 +12390,6 @@
         "node": "*"
       }
     },
-    "node_modules/mrmime": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/mrmime/-/mrmime-1.0.1.tgz",
-      "integrity": "sha512-hzzEagAgDyoU1Q6yg5uI+AorQgdvMCur3FcKf7NhMKWsaYg+RnbTyHRa/9IlLF9rf455MOCtcqqrQQ83pPP7Uw==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/ms": {
       "version": "2.1.3",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
@@ -13516,6 +13327,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
       "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -15039,6 +14851,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -15319,16 +15132,11 @@
       "resolved": "https://registry.npmjs.org/server-only/-/server-only-0.0.1.tgz",
       "integrity": "sha512-qepMx2JxAa5jjfzxG79yPPq+8BuFToHd1hm7kI+Z4zAq1ftQiP7HcxMhDDItrbtwVeLg/cY2JnKnrcFkmiswNA=="
     },
-    "node_modules/set-cookie-parser": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/set-cookie-parser/-/set-cookie-parser-2.7.1.tgz",
-      "integrity": "sha512-IOc8uWeOZgnb3ptbCURJWNjWUPcO3ZnTTdzsurqERrP6nPyv+paC55vJM0LpOlT2ne+Ix+9+CRG1MNLlyZ4GjQ==",
-      "license": "MIT"
-    },
     "node_modules/set-function-length": {
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -15755,12 +15563,6 @@
         "node": ">= 0.10.0"
       }
     },
-    "node_modules/stream-slice": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/stream-slice/-/stream-slice-0.1.2.tgz",
-      "integrity": "sha512-QzQxpoacatkreL6jsxnVb7X5R/pGw9OUv2qWTYWnmLpg4NdN31snPy/f3TdQE1ZUXaThRvj1Zw4/OGg0ZkaLMA==",
-      "license": "MIT"
-    },
     "node_modules/strict-uri-encode": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/strict-uri-encode/-/strict-uri-encode-2.0.0.tgz",
@@ -16633,12 +16435,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
-    "node_modules/turbo-stream": {
-      "version": "2.4.0",
-      "resolved": "https://registry.npmjs.org/turbo-stream/-/turbo-stream-2.4.0.tgz",
-      "integrity": "sha512-FHncC10WpBd2eOmGwpmQsWLDoK4cqsA/UT/GqNoaKOQnT8uzhtCbg3EoUDMvqpOSAI0S26mr0rkjzbOO6S3v1g==",
-      "license": "ISC"
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -16748,7 +16544,7 @@
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
       "integrity": "sha512-84MVSjMEHP+FQRPy3pX9sTVV/INIex71s9TL2Gm5FG/WG1SqXeKyZ0k7/blY/4FdOzI12CBy1vGc4og/eus0fw==",
-      "devOptional": true,
+      "dev": true,
       "bin": {
         "tsc": "bin/tsc",
         "tsserver": "bin/tsserver"
@@ -16985,19 +16781,6 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/util": {
-      "version": "0.12.5",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.12.5.tgz",
-      "integrity": "sha512-kZf/K6hEIrWHI6XqOFUiiMa+79wE/D8Q+NCNAWclkyg3b4d2k7s0QGepNjiABc+aR3N1PAyHL7p6UcLY6LmrnA==",
-      "license": "MIT",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "is-arguments": "^1.0.4",
-        "is-generator-function": "^1.0.7",
-        "is-typed-array": "^1.1.3",
-        "which-typed-array": "^1.1.2"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
@@ -17099,18 +16882,6 @@
         "defaults": "^1.0.3"
       }
     },
-    "node_modules/web-encoding": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/web-encoding/-/web-encoding-1.1.5.tgz",
-      "integrity": "sha512-HYLeVCdJ0+lBYV2FvNZmv3HJ2Nt0QYXqZojk3d9FJOLkwnuhzM9tmamh8d7HPM8QqjKH8DeHkFTx+CFlWpZZDA==",
-      "license": "MIT",
-      "dependencies": {
-        "util": "^0.12.3"
-      },
-      "optionalDependencies": {
-        "@zxing/text-encoding": "0.9.0"
-      }
-    },
     "node_modules/web-streams-polyfill": {
       "version": "3.3.3",
       "resolved": "https://registry.npmjs.org/web-streams-polyfill/-/web-streams-polyfill-3.3.3.tgz",
@@ -17337,6 +17108,7 @@
       "version": "1.1.18",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
       "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
+      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 05aba50..8cf43ee 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -71,6 +71,10 @@ export default function RootLayout() {
         name="success"
         options={{ headerTitle: '', headerTransparent: true }}
       />
+      <Stack.Screen
+        name="change-password"
+        options={{ headerTitle: '', headerTransparent: true }}
+      />
     </Stack>
   );
 }
diff --git a/src/app/change-password.tsx b/src/app/change-password.tsx
new file mode 100644
index 0000000..e14c711
--- /dev/null
+++ b/src/app/change-password.tsx
@@ -0,0 +1,2 @@
+import ChangePasswordScreen from '../screens/PasswordChangeScreen';
+export default ChangePasswordScreen;
diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
new file mode 100644
index 0000000..83ef806
--- /dev/null
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -0,0 +1,200 @@
+import React, { useState } from 'react';
+import { View, Alert, StyleSheet, TouchableOpacity } from 'react-native';
+import { useRouter } from 'expo-router';
+import Button from '../components/Button';
+import Input from '../components/Input';
+import PoppinsText from '../components/PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
+
+export default function ChangePasswordScreen() {
+  const router = useRouter();
+  const [currentPassword, setCurrentPassword] = useState('');
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+  const [loading, setLoading] = useState(false);
+  // const api = new PharmaTech(true);
+
+  const handleChangePassword = async () => {
+    if (loading) return;
+
+    if (!currentPassword || !newPassword || !confirmPassword) {
+      Alert.alert('Error', 'Todos los campos son obligatorios.');
+      return;
+    }
+
+    if (newPassword.length < 8) {
+      Alert.alert(
+        'Error',
+        'La nueva contraseña debe tener al menos 8 caracteres.',
+      );
+      return;
+    }
+
+    if (newPassword !== confirmPassword) {
+      Alert.alert('Error', 'Las contraseñas no coinciden.');
+      return;
+    }
+
+    if (newPassword === currentPassword) {
+      Alert.alert(
+        'Error',
+        'La nueva contraseña debe ser diferente a la actual.',
+      );
+      return;
+    }
+
+    setLoading(true);
+    try {
+      //await api.auth.changePassword({ currentPassword, newPassword });
+      Alert.alert('Éxito', 'Contraseña cambiada correctamente.', [
+        {
+          text: 'OK',
+          onPress: () => router.replace('/categories'),
+        },
+      ]);
+    } catch (error) {
+      console.error('Error al cambiar la contraseña:', error);
+      Alert.alert(
+        'Error',
+        'No se pudo cambiar la contraseña, verifica tus datos.',
+      );
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <View style={styles.container}>
+      {/* Título */}
+      <PoppinsText weight="medium" style={styles.title}>
+        Cambiar Contraseña
+      </PoppinsText>
+
+      {/* Descripción debajo del título */}
+      <PoppinsText weight="regular" style={styles.description}>
+        Crea una nueva contraseña.
+      </PoppinsText>
+      <PoppinsText weight="regular" style={styles.description2}>
+        Asegúrate de que sea diferente a las anteriores por seguridad.
+      </PoppinsText>
+      <View style={styles.inputsContainer}>
+        <View style={styles.inputGroup}>
+          <Input
+            label="Contraseña Actual"
+            placeholder="Ingresa tu contraseña actual"
+            value={currentPassword}
+            fieldType="password"
+            getValue={setCurrentPassword}
+            backgroundColor={Colors.menuWhite}
+          />
+        </View>
+
+        <View style={styles.inputGroup}>
+          <Input
+            label="Contraseña Nueva"
+            placeholder="Ingresa tu nueva contraseña"
+            value={newPassword}
+            fieldType="password"
+            getValue={setNewPassword}
+            backgroundColor={Colors.menuWhite}
+            errorText="Debe tener al menos 8 caracteres"
+          />
+        </View>
+
+        <View style={styles.inputGroup}>
+          <Input
+            label="Repetir Nueva Contraseña"
+            placeholder="Repite tu nueva contraseña"
+            value={confirmPassword}
+            fieldType="password"
+            getValue={setConfirmPassword}
+            backgroundColor={Colors.menuWhite}
+          />
+        </View>
+      </View>
+
+      {/* Enlace de recuperación de contraseña */}
+      <TouchableOpacity
+        onPress={() => router.push('/recover-password')}
+        style={styles.forgotPasswordContainer}
+      >
+        <PoppinsText weight="regular" style={styles.forgotPasswordText}>
+          ¿Olvidaste tu contraseña?{' '}
+          <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
+            Ingresa aquí
+          </PoppinsText>
+        </PoppinsText>
+      </TouchableOpacity>
+
+      <Button
+        title="Continuar"
+        onPress={handleChangePassword}
+        style={styles.button}
+        size="medium"
+        loading={loading}
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    justifyContent: 'flex-start',
+    alignItems: 'center',
+    paddingTop: 100,
+    paddingHorizontal: 20,
+  },
+  title: {
+    fontSize: FontSizes.h4.size,
+    lineHeight: FontSizes.h4.lineHeight,
+    marginBottom: 10,
+    color: Colors.textMain,
+  },
+  description: {
+    marginTop: 30,
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    textAlign: 'center',
+    marginBottom: 0,
+    color: Colors.textLowContrast,
+  },
+  description2: {
+    marginTop: 0,
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    textAlign: 'center',
+    marginBottom: 22,
+    color: Colors.textLowContrast,
+  },
+  inputsContainer: {
+    width: '100%',
+  },
+  inputGroup: {
+    marginBottom: 24, // Aumenta la separación entre los campos
+  },
+  changePasswordButton: {
+    marginTop: 16,
+    width: '100%',
+    height: 50,
+  },
+  forgotPasswordContainer: {
+    marginTop: 5,
+  },
+  forgotPasswordText: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.textMain,
+  },
+  forgotPasswordLink: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.secondaryLight, // Color azul claro para indicar que es un enlace
+  },
+  button: {
+    marginTop: 24,
+    width: '100%',
+    height: 50,
+  },
+});

From 64d9fa8f3b7ba2df0666eebf4c174231c9a5409b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 24 Mar 2025 21:44:47 -0400
Subject: [PATCH 002/291] Installing redux and testing its setup

---
 package-lock.json                    | 86 ++++++++++++++++++++++++++++
 package.json                         |  2 +
 src/app/_layout.tsx                  | 63 ++++++++++----------
 src/components/CartTotal.tsx         | 12 ++++
 src/redux/slices/cartSlice.ts        | 72 +++++++++++++++++++++++
 src/redux/store.ts                   | 13 +++++
 src/screens/tab/CategoriesScreen.tsx | 23 ++++++++
 7 files changed, 241 insertions(+), 30 deletions(-)
 create mode 100644 src/components/CartTotal.tsx
 create mode 100644 src/redux/slices/cartSlice.ts
 create mode 100644 src/redux/store.ts

diff --git a/package-lock.json b/package-lock.json
index 4479c82..78b9a0b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,7 @@
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
         "@pharmatech/sdk": "^0.3.1",
+        "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
         "expo-constants": "~17.0.7",
@@ -33,6 +34,7 @@
         "react-native-safe-area-context": "4.12.0",
         "react-native-screens": "~4.4.0",
         "react-native-svg": "^15.11.2",
+        "react-redux": "^9.2.0",
         "tailwindcss": "^3.4.17"
       },
       "devDependencies": {
@@ -4075,6 +4077,36 @@
         "nanoid": "3.3.8"
       }
     },
+    "node_modules/@reduxjs/toolkit": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/@reduxjs/toolkit/-/toolkit-2.6.1.tgz",
+      "integrity": "sha512-SSlIqZNYhqm/oMkXbtofwZSt9lrncblzo6YcZ9zoX+zLngRBrCOjK4lNLdkNucJF58RHOWrD9txT3bT3piH7Zw==",
+      "license": "MIT",
+      "dependencies": {
+        "immer": "^10.0.3",
+        "redux": "^5.0.1",
+        "redux-thunk": "^3.1.0",
+        "reselect": "^5.1.0"
+      },
+      "peerDependencies": {
+        "react": "^16.9.0 || ^17.0.0 || ^18 || ^19",
+        "react-redux": "^7.2.1 || ^8.1.3 || ^9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "react": {
+          "optional": true
+        },
+        "react-redux": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/@reduxjs/toolkit/node_modules/reselect": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.1.1.tgz",
+      "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
+      "license": "MIT"
+    },
     "node_modules/@remix-run/node": {
       "version": "2.16.0",
       "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.16.0.tgz",
@@ -4894,6 +4926,12 @@
       "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
       "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
     },
+    "node_modules/@types/use-sync-external-store": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
+      "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
+      "license": "MIT"
+    },
     "node_modules/@types/yargs": {
       "version": "17.0.33",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
@@ -9516,6 +9554,16 @@
         "node": ">=16.x"
       }
     },
+    "node_modules/immer": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
     "node_modules/import-fresh": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
@@ -14536,6 +14584,29 @@
         "async-limiter": "~1.0.0"
       }
     },
+    "node_modules/react-redux": {
+      "version": "9.2.0",
+      "resolved": "https://registry.npmjs.org/react-redux/-/react-redux-9.2.0.tgz",
+      "integrity": "sha512-ROY9fvHhwOD9ySfrF0wmvu//bKCQ6AeZZq1nJNtbDC+kk5DuSuNX/n6YWYF/SYy7bSba4D4FSz8DJeKY/S/r+g==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/use-sync-external-store": "^0.0.6",
+        "use-sync-external-store": "^1.4.0"
+      },
+      "peerDependencies": {
+        "@types/react": "^18.2.25 || ^19",
+        "react": "^18.0 || ^19",
+        "redux": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/react": {
+          "optional": true
+        },
+        "redux": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-refresh": {
       "version": "0.14.2",
       "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.14.2.tgz",
@@ -14670,6 +14741,21 @@
         "node": ">=8"
       }
     },
+    "node_modules/redux": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/redux/-/redux-5.0.1.tgz",
+      "integrity": "sha512-M9/ELqF6fy8FwmkpnF0S3YKOqMyoWJ4+CS5Efg2ct3oY9daQvd/Pc71FpGZsVsbl3Cpb+IIcjBDUnnyBdQbq4w==",
+      "license": "MIT"
+    },
+    "node_modules/redux-thunk": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/redux-thunk/-/redux-thunk-3.1.0.tgz",
+      "integrity": "sha512-NW2r5T6ksUKXCabzhL9z+h206HQw/NJkcLm1GPImRQ8IzfXwRGqjVhKJGauHirT0DAuyy6hjdnMZaRoAcy0Klw==",
+      "license": "MIT",
+      "peerDependencies": {
+        "redux": "^5.0.0"
+      }
+    },
     "node_modules/reflect.getprototypeof": {
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
diff --git a/package.json b/package.json
index 132bbdf..e0b119e 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,7 @@
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
     "@pharmatech/sdk": "^0.3.1",
+    "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
@@ -43,6 +44,7 @@
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
+    "react-redux": "^9.2.0",
     "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index bf3dc4e..4f45ff0 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -14,6 +14,8 @@ import {
 } from '@expo-google-fonts/poppins';
 import { Stack } from 'expo-router/stack';
 import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+import { Provider } from 'react-redux'; // Importa el Provider de Redux
+import { store } from '../redux/store'; // Importa el store de Redux
 
 SplashScreen.preventAutoHideAsync();
 
@@ -39,36 +41,37 @@ export default function RootLayout() {
   }
 
   return (
-    <Stack
-      screenOptions={({ navigation }) => ({
-        headerBackVisible: false,
-        headerLeft: () =>
-          navigation.canGoBack() ? (
-            <TouchableOpacity onPress={navigation.goBack}>
-              <ChevronLeftIcon width={24} height={24} color="#000" />
-            </TouchableOpacity>
-          ) : null,
-        headerBackTitleVisible: false,
-      })}
-    >
-      <Stack.Screen name="index" redirect={true} />
-
-      <Stack.Screen name="login" options={{ headerShown: false }} />
-
-      <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-      <Stack.Screen
-        name="register"
-        options={{ headerTitle: '', headerTransparent: true }}
-      />
-      <Stack.Screen
-        name="passwordRecovery"
-        options={{ headerTitle: '', headerTransparent: true }}
-      />
-      <Stack.Screen
-        name="success"
-        options={{ headerTitle: '', headerTransparent: true }}
-      />
-    </Stack>
+    <Provider store={store}>
+      {/* Envuelve el Stack con el Provider */}
+      <Stack
+        screenOptions={({ navigation }) => ({
+          headerBackVisible: false,
+          headerLeft: () =>
+            navigation.canGoBack() ? (
+              <TouchableOpacity onPress={navigation.goBack}>
+                <ChevronLeftIcon width={24} height={24} color="#000" />
+              </TouchableOpacity>
+            ) : null,
+          headerBackTitleVisible: false,
+        })}
+      >
+        <Stack.Screen name="index" redirect={true} />
+        <Stack.Screen name="login" options={{ headerShown: false }} />
+        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="register"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="passwordRecovery"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="success"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+      </Stack>
+    </Provider>
   );
 }
 
diff --git a/src/components/CartTotal.tsx b/src/components/CartTotal.tsx
new file mode 100644
index 0000000..cb35ecb
--- /dev/null
+++ b/src/components/CartTotal.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { useSelector } from 'react-redux';
+import { RootState } from '../redux/store';
+import { Text } from 'react-native';
+
+const CartTotal = () => {
+  const total = useSelector((state: RootState) => state.cart.total);
+
+  return <Text>Total del carrito: ${total}</Text>;
+};
+
+export default CartTotal;
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
new file mode 100644
index 0000000..93afc77
--- /dev/null
+++ b/src/redux/slices/cartSlice.ts
@@ -0,0 +1,72 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+// Tipos para el carrito
+type CartItem = {
+  id: string;
+  name: string;
+  price: number;
+  quantity: number;
+  image: string;
+};
+
+type CartState = {
+  items: CartItem[];
+  total: number;
+};
+
+// Estado inicial
+const initialState: CartState = {
+  items: [],
+  total: 0,
+};
+
+// Slice del carrito
+const cartSlice = createSlice({
+  name: 'cart',
+  initialState,
+  reducers: {
+    addItem: (state, action: PayloadAction<CartItem>) => {
+      const existingItem = state.items.find(
+        (item) => item.id === action.payload.id,
+      );
+      if (existingItem) {
+        existingItem.quantity += action.payload.quantity;
+      } else {
+        state.items.push(action.payload);
+      }
+      state.total = state.items.reduce(
+        (sum, item) => sum + item.price * item.quantity,
+        0,
+      );
+    },
+    removeItem: (state, action: PayloadAction<string>) => {
+      state.items = state.items.filter((item) => item.id !== action.payload);
+      state.total = state.items.reduce(
+        (sum, item) => sum + item.price * item.quantity,
+        0,
+      );
+    },
+    updateQuantity: (
+      state,
+      action: PayloadAction<{ id: string; quantity: number }>,
+    ) => {
+      const item = state.items.find((item) => item.id === action.payload.id);
+      if (item) {
+        item.quantity = action.payload.quantity;
+      }
+      state.total = state.items.reduce(
+        (sum, item) => sum + item.price * item.quantity,
+        0,
+      );
+    },
+    clearCart: (state) => {
+      state.items = [];
+      state.total = 0;
+    },
+  },
+});
+
+// Exportar las acciones y el reducer
+export const { addItem, removeItem, updateQuantity, clearCart } =
+  cartSlice.actions;
+export default cartSlice.reducer;
diff --git a/src/redux/store.ts b/src/redux/store.ts
new file mode 100644
index 0000000..60b9866
--- /dev/null
+++ b/src/redux/store.ts
@@ -0,0 +1,13 @@
+import { configureStore } from '@reduxjs/toolkit';
+import cartReducer from './slices/cartSlice'; // Importa el reducer del carrito
+
+export const store = configureStore({
+  reducer: {
+    cart: cartReducer, // Conecta el slice del carrito
+  },
+  devTools: true, // Habilita Redux DevTools
+});
+
+// Tipos para el store
+export type RootState = ReturnType<typeof store.getState>;
+export type AppDispatch = typeof store.dispatch;
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index 1ecbcbc..52c6d96 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -6,10 +6,14 @@ import { useRouter } from 'expo-router';
 import { Colors } from '../../styles/theme';
 import * as SecureStore from 'expo-secure-store';
 import Popup from '../../components/Popup';
+import CartTotal from '../../components/CartTotal';
+import { useDispatch } from 'react-redux';
+import { addItem, removeItem } from '../../redux/slices/cartSlice';
 
 export default function CategoriesScreen() {
   const router = useRouter();
   const [showPopup, setShowPopup] = useState(false);
+  const dispatch = useDispatch();
 
   const handleLogout = async () => {
     try {
@@ -21,6 +25,22 @@ export default function CategoriesScreen() {
     }
   };
 
+  const handleAddToCart = () => {
+    dispatch(
+      addItem({
+        id: '1',
+        name: 'Camiseta Azul',
+        price: 20,
+        quantity: 1,
+        image: 'https://example.com/camiseta.jpg',
+      }),
+    );
+  };
+
+  const handleRemoveFromCart = () => {
+    dispatch(removeItem('1')); // Elimina el producto con ID '1'
+  };
+
   return (
     <View style={styles.container}>
       {/* Popup */}
@@ -47,6 +67,9 @@ export default function CategoriesScreen() {
         mode="filled"
         size="large"
       />
+      <CartTotal />
+      <Button title="Agregar al carrito" onPress={handleAddToCart} />
+      <Button title="Eliminar del carrito" onPress={handleRemoveFromCart} />
     </View>
   );
 }

From 5785c611ad1ae20ca63283e2ea7dccbac694c681 Mon Sep 17 00:00:00 2001
From: luiger <luiger852@gmail.com>
Date: Tue, 25 Mar 2025 00:51:04 -0400
Subject: [PATCH 003/291] toggle

---
 src/components/Toggle.tsx | 87 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 87 insertions(+)
 create mode 100644 src/components/Toggle.tsx

diff --git a/src/components/Toggle.tsx b/src/components/Toggle.tsx
new file mode 100644
index 0000000..77b5ef7
--- /dev/null
+++ b/src/components/Toggle.tsx
@@ -0,0 +1,87 @@
+import React, { useState } from 'react';
+import { Pressable, Animated, StyleSheet } from 'react-native';
+import { Colors } from '../styles/theme';
+
+interface ToggleProps {
+  value?: boolean;
+  onChange?: (newValue: boolean) => void;
+  disabled?: boolean;
+}
+
+const TOGGLE_CONFIG = {
+  width: 55,
+  height: 32,
+  radius: 30,
+  circleSize: 26, // Ajustado para que el círculo quede bien dentro del switch
+};
+
+const Toggle: React.FC<ToggleProps> = ({
+  value = false,
+  onChange,
+  disabled = false,
+}) => {
+  const [toggleValue, setToggleValue] = useState(value);
+  const animatedValue = new Animated.Value(value ? 1 : 0);
+
+  const handleToggle = () => {
+    if (disabled) return;
+    const newValue = !toggleValue;
+    setToggleValue(newValue);
+    onChange?.(newValue);
+
+    Animated.timing(animatedValue, {
+      toValue: newValue ? 1 : 0,
+      duration: 200,
+      useNativeDriver: false,
+    }).start();
+  };
+
+  const translateX = animatedValue.interpolate({
+    inputRange: [0, 1],
+    outputRange: [2, TOGGLE_CONFIG.width - TOGGLE_CONFIG.circleSize - 2],
+  });
+
+  return (
+    <Pressable
+      onPress={handleToggle}
+      style={[
+        styles.toggleBase,
+        {
+          width: TOGGLE_CONFIG.width,
+          height: TOGGLE_CONFIG.height,
+          backgroundColor: toggleValue ? Colors.toggleOn : Colors.toggleOff,
+          borderRadius: TOGGLE_CONFIG.radius,
+        },
+        disabled && styles.disabled,
+      ]}
+    >
+      <Animated.View
+        style={[
+          styles.circle,
+          {
+            width: TOGGLE_CONFIG.circleSize,
+            height: TOGGLE_CONFIG.circleSize,
+            transform: [{ translateX }],
+          },
+        ]}
+      />
+    </Pressable>
+  );
+};
+
+const styles = StyleSheet.create({
+  toggleBase: {
+    justifyContent: 'center',
+    padding: 2,
+  },
+  circle: {
+    backgroundColor: Colors.textWhite,
+    borderRadius: 50,
+    position: 'absolute',
+  },
+  disabled: {
+    opacity: 0.5,
+  },
+});
+
+export default Toggle;

From 12f56e005a510ba25cc6237bec98fd9db9e37344 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 25 Mar 2025 12:50:18 -0400
Subject: [PATCH 004/291] Making some progress in cartlist

---
 src/app/_layout.tsx            |   4 +
 src/app/cart.tsx               |   3 +
 src/components/TopBar.tsx      |   9 +-
 src/redux/slices/cartSlice.ts  |   2 +-
 src/screens/CartListScreen.tsx | 146 +++++++++++++++++++++++++++++++++
 src/screens/tab/HomeScreen.tsx |  17 +++-
 6 files changed, 178 insertions(+), 3 deletions(-)
 create mode 100644 src/app/cart.tsx
 create mode 100644 src/screens/CartListScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 4f45ff0..77662fa 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -70,6 +70,10 @@ export default function RootLayout() {
           name="success"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="cart"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
       </Stack>
     </Provider>
   );
diff --git a/src/app/cart.tsx b/src/app/cart.tsx
new file mode 100644
index 0000000..3c79068
--- /dev/null
+++ b/src/app/cart.tsx
@@ -0,0 +1,3 @@
+import CartListScreen from '../../src/screens/CartListScreen';
+
+export default CartListScreen;
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index f5f62e5..17dcd2a 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -7,9 +7,11 @@ import {
 import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
+import { useRouter } from 'expo-router';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
+  const router = useRouter();
 
   const handleSearch = () => {
     // Search logic
@@ -31,7 +33,12 @@ const TopBar = () => {
         </View>
 
         {/* Right cart icon */}
-        <TouchableOpacity style={styles.iconButton}>
+        <TouchableOpacity
+          style={styles.iconButton}
+          onPress={() => {
+            router.push('/cart');
+          }}
+        >
           <ShoppingCartIcon size={26} color={Colors.textMain} />
         </TouchableOpacity>
       </View>
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 93afc77..1d5cf4e 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -1,7 +1,7 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
 // Tipos para el carrito
-type CartItem = {
+export type CartItem = {
   id: string;
   name: string;
   price: number;
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
new file mode 100644
index 0000000..baa905d
--- /dev/null
+++ b/src/screens/CartListScreen.tsx
@@ -0,0 +1,146 @@
+import React from 'react';
+import { View, FlatList, StyleSheet, TouchableOpacity } from 'react-native';
+import { useSelector, useDispatch } from 'react-redux';
+import { RootState } from '../redux/store';
+import { removeItem, updateQuantity } from '../redux/slices/cartSlice';
+import CardButton from '../components/CardButton';
+import { Colors } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import type { CartItem } from '../redux/slices/cartSlice';
+
+const CartListScreen = () => {
+  const dispatch = useDispatch();
+  const cartItems = useSelector((state: RootState) => state.cart.items);
+  const total = useSelector((state: RootState) => state.cart.total);
+
+  const handleRemoveItem = (id: string) => {
+    dispatch(removeItem(id));
+  };
+
+  const handleUpdateQuantity = (id: string, quantity: number) => {
+    dispatch(updateQuantity({ id, quantity }));
+  };
+
+  const renderItem = ({ item }: { item: CartItem }) => (
+    <View style={styles.card}>
+      <View style={styles.imageContainer}>
+        <PoppinsText>Imagen</PoppinsText>
+        {/* Image */}
+      </View>
+      <View style={styles.detailsContainer}>
+        <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
+        <PoppinsText style={styles.productPrice}>${item.price}</PoppinsText>
+        <View style={styles.quantityContainer}>
+          <CardButton
+            getValue={(quantity) => handleUpdateQuantity(item.id, quantity)}
+          />
+        </View>
+        <TouchableOpacity onPress={() => handleRemoveItem(item.id)}>
+          <PoppinsText style={styles.removeText}>Eliminar</PoppinsText>
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.header}>Tu carrito</PoppinsText>
+      <FlatList
+        data={cartItems}
+        renderItem={renderItem}
+        keyExtractor={(item) => item.id}
+        contentContainerStyle={styles.listContainer}
+      />
+      <View style={styles.footer}>
+        <PoppinsText style={styles.totalText}>Total: ${total}</PoppinsText>
+        <TouchableOpacity style={styles.checkoutButton}>
+          <PoppinsText style={styles.checkoutText}>
+            Proceder al Pago
+          </PoppinsText>
+        </TouchableOpacity>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 16,
+  },
+  header: {
+    fontSize: 24,
+    fontWeight: '600',
+    marginBottom: 16,
+  },
+  listContainer: {
+    paddingBottom: 16,
+  },
+  card: {
+    flexDirection: 'row',
+    backgroundColor: '#fff',
+    borderRadius: 8,
+    padding: 16,
+    marginBottom: 16,
+    shadowColor: '#000',
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  imageContainer: {
+    width: 80,
+    height: 80,
+    backgroundColor: '#f0f0f0',
+    borderRadius: 8,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginRight: 16,
+  },
+  detailsContainer: {
+    flex: 1,
+  },
+  productName: {
+    fontSize: 16,
+    fontWeight: '500',
+    marginBottom: 8,
+  },
+  productPrice: {
+    fontSize: 14,
+    color: Colors.secondary,
+    marginBottom: 8,
+  },
+  quantityContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  removeText: {
+    fontSize: 14,
+    color: Colors.semanticDanger,
+  },
+  footer: {
+    borderTopWidth: 1,
+    borderTopColor: '#e0e0e0',
+    paddingTop: 16,
+    alignItems: 'center',
+  },
+  totalText: {
+    fontSize: 18,
+    fontWeight: '600',
+    marginBottom: 16,
+  },
+  checkoutButton: {
+    backgroundColor: Colors.primary,
+    paddingVertical: 12,
+    paddingHorizontal: 24,
+    borderRadius: 8,
+  },
+  checkoutText: {
+    fontSize: 16,
+    color: '#fff',
+    fontWeight: '600',
+  },
+});
+
+export default CartListScreen;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 3c85b4f..6285d2d 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,5 +1,7 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
+import { useDispatch } from 'react-redux';
+import { addItem } from '../../redux/slices/cartSlice';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
@@ -7,6 +9,7 @@ import { ProductService } from '../../services/products';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState([{}]);
+  const dispatch = useDispatch();
 
   const obtainProducts = async () => {
     const productsData = await ProductService.getProducts(1, 20);
@@ -17,13 +20,25 @@ export default function HomeScreen() {
 
       pd.forEach((p) => {
         carouselProducts.push({
+          id: p.product.id, // Product id
           imageUrl: p.product.images[0].url,
           name: p.product.genericName,
           category: p.product.categories[0].name,
           originalPrice: p.price,
           discount: 10,
           finalPrice: p.price - p.price * 0.1,
-          getQuantity: () => console.log('producto'),
+          getQuantity: (quantity: number) => {
+            // Update cart
+            dispatch(
+              addItem({
+                id: p.product.id,
+                name: p.product.genericName,
+                price: p.price,
+                quantity,
+                image: p.product.images[0].url,
+              }),
+            );
+          },
         });
       });
 

From 15dda8661fdbb717d255b17f61b3409f453f45ff Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 25 Mar 2025 21:03:04 -0400
Subject: [PATCH 005/291] More changes to cartlist logic

---
 src/components/Card.tsx        | 13 ++++++++++-
 src/components/CardButton.tsx  | 20 ++++++++++++-----
 src/hooks/useCart.ts           | 41 ++++++++++++++++++++++++++++++++++
 src/redux/slices/cartSlice.ts  |  6 +----
 src/screens/CartListScreen.tsx | 33 +++++++++++----------------
 src/screens/tab/HomeScreen.tsx | 25 +++++++++------------
 6 files changed, 93 insertions(+), 45 deletions(-)
 create mode 100644 src/hooks/useCart.ts

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index d494007..7bb61cd 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -4,6 +4,7 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
 import CardButton from './CardButton';
 import { truncateString } from '../utils/commons';
+import { useCart } from '../hooks/useCart';
 
 interface ProductCardProps {
   imageUrl?: string;
@@ -24,6 +25,8 @@ const ProductCard: React.FC<ProductCardProps> = ({
   finalPrice,
   getQuantity,
 }) => {
+  const { getItemQuantity, updateCartQuantity } = useCart();
+  const initialQuantity = getItemQuantity(name);
   return (
     <View style={styles.card}>
       <View
@@ -49,7 +52,15 @@ const ProductCard: React.FC<ProductCardProps> = ({
             style={{ borderRadius: 15 }}
           />
           <View style={styles.cardButtonContainer}>
-            <CardButton getValue={getQuantity} />
+            <CardButton
+              getValue={(quantity) => {
+                if (getQuantity) getQuantity(quantity);
+                if (quantity !== initialQuantity) {
+                  updateCartQuantity(name, quantity);
+                }
+              }}
+              initialValue={initialQuantity}
+            />
           </View>
         </View>
       </View>
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index 256e198..54ce3ee 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -6,10 +6,16 @@ import { Colors, FontSizes } from '../styles/theme';
 
 interface CardButtonProps {
   getValue?: (count: number) => void;
+  initialValue: number;
+  syncQuantity?: (count: number) => void;
 }
 
-const CardButton: React.FC<CardButtonProps> = ({ getValue }) => {
-  const [count, setCount] = useState(0);
+const CardButton: React.FC<CardButtonProps> = ({
+  getValue,
+  initialValue = 0,
+  syncQuantity,
+}) => {
+  const [count, setCount] = useState(initialValue);
   const [showCounter, setShowCounter] = useState(false);
 
   useEffect(() => {
@@ -17,9 +23,15 @@ const CardButton: React.FC<CardButtonProps> = ({ getValue }) => {
     else {
       setShowCounter(true);
     }
+  }, [count]);
+
+  useEffect(() => {
     if (getValue) {
       getValue(count);
     }
+    if (syncQuantity) {
+      syncQuantity(count);
+    }
   }, [count]);
 
   const incrementCount = () => {
@@ -42,9 +54,7 @@ const CardButton: React.FC<CardButtonProps> = ({ getValue }) => {
       {!showCounter ? (
         <TouchableOpacity
           style={styles.mainButton}
-          onPress={() => {
-            showCounterIncrement();
-          }}
+          onPress={showCounterIncrement}
         >
           <PoppinsText style={styles.buttonText}>
             <PlusIcon size={20} color={Colors.textWhite} />
diff --git a/src/hooks/useCart.ts b/src/hooks/useCart.ts
new file mode 100644
index 0000000..7fea045
--- /dev/null
+++ b/src/hooks/useCart.ts
@@ -0,0 +1,41 @@
+import { useDispatch, useSelector } from 'react-redux';
+import { RootState } from '../redux/store';
+import { addItem, removeItem, updateQuantity } from '../redux/slices/cartSlice';
+
+export const useCart = () => {
+  const dispatch = useDispatch();
+  const cartItems = useSelector((state: RootState) => state.cart.items);
+  const total = useSelector((state: RootState) => state.cart.total);
+
+  const addToCart = (item: {
+    id: string;
+    name: string;
+    price: number;
+    quantity: number;
+    image: string;
+  }) => {
+    dispatch(addItem(item));
+  };
+
+  const removeFromCart = (id: string) => {
+    dispatch(removeItem(id));
+  };
+
+  const updateCartQuantity = (id: string, quantity: number) => {
+    dispatch(updateQuantity({ id, quantity }));
+  };
+
+  const getItemQuantity = (id: string) => {
+    const item = cartItems.find((item) => item.id === id);
+    return item ? item.quantity : 0;
+  };
+
+  return {
+    cartItems,
+    total,
+    addToCart,
+    removeFromCart,
+    updateCartQuantity,
+    getItemQuantity,
+  };
+};
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 1d5cf4e..81fbf73 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -1,6 +1,5 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
 
-// Tipos para el carrito
 export type CartItem = {
   id: string;
   name: string;
@@ -14,13 +13,11 @@ type CartState = {
   total: number;
 };
 
-// Estado inicial
 const initialState: CartState = {
   items: [],
   total: 0,
 };
 
-// Slice del carrito
 const cartSlice = createSlice({
   name: 'cart',
   initialState,
@@ -30,7 +27,7 @@ const cartSlice = createSlice({
         (item) => item.id === action.payload.id,
       );
       if (existingItem) {
-        existingItem.quantity += action.payload.quantity;
+        existingItem.quantity = action.payload.quantity;
       } else {
         state.items.push(action.payload);
       }
@@ -66,7 +63,6 @@ const cartSlice = createSlice({
   },
 });
 
-// Exportar las acciones y el reducer
 export const { addItem, removeItem, updateQuantity, clearCart } =
   cartSlice.actions;
 export default cartSlice.reducer;
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index baa905d..4fbb39a 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -1,25 +1,13 @@
 import React from 'react';
 import { View, FlatList, StyleSheet, TouchableOpacity } from 'react-native';
-import { useSelector, useDispatch } from 'react-redux';
-import { RootState } from '../redux/store';
-import { removeItem, updateQuantity } from '../redux/slices/cartSlice';
+import { useCart } from '../hooks/useCart';
 import CardButton from '../components/CardButton';
-import { Colors } from '../styles/theme';
+import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import type { CartItem } from '../redux/slices/cartSlice';
 
 const CartListScreen = () => {
-  const dispatch = useDispatch();
-  const cartItems = useSelector((state: RootState) => state.cart.items);
-  const total = useSelector((state: RootState) => state.cart.total);
-
-  const handleRemoveItem = (id: string) => {
-    dispatch(removeItem(id));
-  };
-
-  const handleUpdateQuantity = (id: string, quantity: number) => {
-    dispatch(updateQuantity({ id, quantity }));
-  };
+  const { cartItems, total, removeFromCart, updateCartQuantity } = useCart();
 
   const renderItem = ({ item }: { item: CartItem }) => (
     <View style={styles.card}>
@@ -32,10 +20,12 @@ const CartListScreen = () => {
         <PoppinsText style={styles.productPrice}>${item.price}</PoppinsText>
         <View style={styles.quantityContainer}>
           <CardButton
-            getValue={(quantity) => handleUpdateQuantity(item.id, quantity)}
+            getValue={(quantity) => updateCartQuantity(item.id, quantity)}
+            initialValue={item.quantity}
+            syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
           />
         </View>
-        <TouchableOpacity onPress={() => handleRemoveItem(item.id)}>
+        <TouchableOpacity onPress={() => removeFromCart(item.id)}>
           <PoppinsText style={styles.removeText}>Eliminar</PoppinsText>
         </TouchableOpacity>
       </View>
@@ -44,7 +34,9 @@ const CartListScreen = () => {
 
   return (
     <View style={styles.container}>
-      <PoppinsText style={styles.header}>Tu carrito</PoppinsText>
+      <PoppinsText style={styles.header} weight="regular">
+        Carrito de compras
+      </PoppinsText>
       <FlatList
         data={cartItems}
         renderItem={renderItem}
@@ -70,9 +62,10 @@ const styles = StyleSheet.create({
     padding: 16,
   },
   header: {
-    fontSize: 24,
-    fontWeight: '600',
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
     marginBottom: 16,
+    color: Colors.textMain,
   },
   listContainer: {
     paddingBottom: 16,
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 6285d2d..5da1b6b 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
-import { useDispatch } from 'react-redux';
-import { addItem } from '../../redux/slices/cartSlice';
+import { useCart } from '../../hooks/useCart';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
@@ -9,7 +8,7 @@ import { ProductService } from '../../services/products';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState([{}]);
-  const dispatch = useDispatch();
+  const { addToCart, updateCartQuantity } = useCart();
 
   const obtainProducts = async () => {
     const productsData = await ProductService.getProducts(1, 20);
@@ -20,7 +19,7 @@ export default function HomeScreen() {
 
       pd.forEach((p) => {
         carouselProducts.push({
-          id: p.product.id, // Product id
+          id: p.product.id,
           imageUrl: p.product.images[0].url,
           name: p.product.genericName,
           category: p.product.categories[0].name,
@@ -28,16 +27,14 @@ export default function HomeScreen() {
           discount: 10,
           finalPrice: p.price - p.price * 0.1,
           getQuantity: (quantity: number) => {
-            // Update cart
-            dispatch(
-              addItem({
-                id: p.product.id,
-                name: p.product.genericName,
-                price: p.price,
-                quantity,
-                image: p.product.images[0].url,
-              }),
-            );
+            addToCart({
+              id: p.product.id,
+              name: p.product.genericName,
+              price: p.price,
+              quantity,
+              image: p.product.images[0].url,
+            });
+            updateCartQuantity(p.product.id, quantity);
           },
         });
       });

From d4a1c57a5005176bcafe2d3453db3153cf3d6116 Mon Sep 17 00:00:00 2001
From: luiger <luiger852@gmail.com>
Date: Tue, 25 Mar 2025 21:04:40 -0400
Subject: [PATCH 006/291] "Avatar2"

---
 src/components/Avatar.tsx | 57 +++++++++++++++++++++++++++++++++++++++
 1 file changed, 57 insertions(+)
 create mode 100644 src/components/Avatar.tsx

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
new file mode 100644
index 0000000..b2cb67f
--- /dev/null
+++ b/src/components/Avatar.tsx
@@ -0,0 +1,57 @@
+import React from 'react';
+import { Image, Text, View, StyleSheet } from 'react-native';
+import { Colors } from '../styles/theme';
+
+interface AvatarProps {
+  uri?: string; // URL de la imagen de perfil
+  name?: string; // Nombre completo del usuario
+}
+
+const Avatar: React.FC<AvatarProps> = ({ uri, name = '' }) => {
+  const dimension = 32; // Tamaño fijo
+
+  // Función para obtener iniciales del nombre
+  const getInitials = (fullName: string): string => {
+    const words = fullName.trim().split(' ');
+    if (words.length === 1) return words[0].charAt(0).toUpperCase();
+    return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
+  };
+
+  return (
+    <View
+      style={[
+        styles.avatarContainer,
+        { width: dimension, height: dimension, borderRadius: dimension / 2 },
+      ]}
+    >
+      {uri ? (
+        <Image
+          source={{ uri }}
+          style={[styles.avatarImage, { width: dimension, height: dimension }]}
+        />
+      ) : (
+        <Text style={[styles.initials, { fontSize: dimension / 2.5 }]}>
+          {getInitials(name)}
+        </Text>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  avatarContainer: {
+    backgroundColor: Colors.primary, // Color de fondo cuando no hay foto
+    alignItems: 'center',
+    justifyContent: 'center',
+    overflow: 'hidden',
+  },
+  avatarImage: {
+    resizeMode: 'cover',
+  },
+  initials: {
+    color: Colors.textWhite,
+    fontWeight: 'bold',
+  },
+});
+
+export default Avatar;

From fad2a67c4d3afd50870bff55f97ff1a939c2a078 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 25 Mar 2025 22:58:06 -0400
Subject: [PATCH 007/291] Refactoring related files

---
 src/components/CardButton.tsx |  8 ++------
 src/hooks/useCart.ts          | 15 +++++++--------
 src/redux/slices/cartSlice.ts | 18 ++++++------------
 3 files changed, 15 insertions(+), 26 deletions(-)

diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index 54ce3ee..08fa804 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -18,12 +18,8 @@ const CardButton: React.FC<CardButtonProps> = ({
   const [count, setCount] = useState(initialValue);
   const [showCounter, setShowCounter] = useState(false);
 
-  useEffect(() => {
-    if (count == 0) setShowCounter(false);
-    else {
-      setShowCounter(true);
-    }
-  }, [count]);
+  const toggleCounter = () => setShowCounter(count > 0);
+  useEffect(toggleCounter, [count]);
 
   useEffect(() => {
     if (getValue) {
diff --git a/src/hooks/useCart.ts b/src/hooks/useCart.ts
index 7fea045..970c727 100644
--- a/src/hooks/useCart.ts
+++ b/src/hooks/useCart.ts
@@ -1,19 +1,18 @@
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '../redux/store';
-import { addItem, removeItem, updateQuantity } from '../redux/slices/cartSlice';
+import {
+  addItem,
+  removeItem,
+  updateQuantity,
+  CartItem,
+} from '../redux/slices/cartSlice';
 
 export const useCart = () => {
   const dispatch = useDispatch();
   const cartItems = useSelector((state: RootState) => state.cart.items);
   const total = useSelector((state: RootState) => state.cart.total);
 
-  const addToCart = (item: {
-    id: string;
-    name: string;
-    price: number;
-    quantity: number;
-    image: string;
-  }) => {
+  const addToCart = (item: CartItem) => {
     dispatch(addItem(item));
   };
 
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 81fbf73..bd2ac70 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -18,6 +18,9 @@ const initialState: CartState = {
   total: 0,
 };
 
+const calculateTotal = (items: CartItem[]) =>
+  items.reduce((sum, item) => sum + item.price * item.quantity, 0);
+
 const cartSlice = createSlice({
   name: 'cart',
   initialState,
@@ -31,17 +34,11 @@ const cartSlice = createSlice({
       } else {
         state.items.push(action.payload);
       }
-      state.total = state.items.reduce(
-        (sum, item) => sum + item.price * item.quantity,
-        0,
-      );
+      state.total = calculateTotal(state.items);
     },
     removeItem: (state, action: PayloadAction<string>) => {
       state.items = state.items.filter((item) => item.id !== action.payload);
-      state.total = state.items.reduce(
-        (sum, item) => sum + item.price * item.quantity,
-        0,
-      );
+      state.total = calculateTotal(state.items);
     },
     updateQuantity: (
       state,
@@ -51,10 +48,7 @@ const cartSlice = createSlice({
       if (item) {
         item.quantity = action.payload.quantity;
       }
-      state.total = state.items.reduce(
-        (sum, item) => sum + item.price * item.quantity,
-        0,
-      );
+      state.total = calculateTotal(state.items);
     },
     clearCart: (state) => {
       state.items = [];

From d8762facce0c8ab66237726a885e8d97026d087a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 26 Mar 2025 00:14:27 -0400
Subject: [PATCH 008/291] Finally synchronizing product quantity and doing some
 refactoring

---
 src/components/Card.tsx        | 21 +++---------
 src/components/CardButton.tsx  |  4 +++
 src/components/Carousel.tsx    | 20 ++++--------
 src/screens/tab/HomeScreen.tsx | 59 ++++++++++++++++++----------------
 src/types/Product.ts           | 11 +++++++
 5 files changed, 58 insertions(+), 57 deletions(-)
 create mode 100644 src/types/Product.ts

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 7bb61cd..eb97771 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -5,18 +5,10 @@ import PoppinsText from './PoppinsText';
 import CardButton from './CardButton';
 import { truncateString } from '../utils/commons';
 import { useCart } from '../hooks/useCart';
+import { Product } from '../types/Product';
 
-interface ProductCardProps {
-  imageUrl?: string;
-  name: string;
-  category?: string;
-  originalPrice: string;
-  discount?: string;
-  finalPrice?: string;
-  getQuantity?: (count: number) => void;
-}
-
-const ProductCard: React.FC<ProductCardProps> = ({
+const ProductCard: React.FC<Product> = ({
+  id,
   imageUrl,
   name,
   category,
@@ -26,7 +18,6 @@ const ProductCard: React.FC<ProductCardProps> = ({
   getQuantity,
 }) => {
   const { getItemQuantity, updateCartQuantity } = useCart();
-  const initialQuantity = getItemQuantity(name);
   return (
     <View style={styles.card}>
       <View
@@ -55,11 +46,9 @@ const ProductCard: React.FC<ProductCardProps> = ({
             <CardButton
               getValue={(quantity) => {
                 if (getQuantity) getQuantity(quantity);
-                if (quantity !== initialQuantity) {
-                  updateCartQuantity(name, quantity);
-                }
+                updateCartQuantity(id, quantity);
               }}
-              initialValue={initialQuantity}
+              initialValue={getItemQuantity(id)}
             />
           </View>
         </View>
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index 08fa804..265cf84 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -30,6 +30,10 @@ const CardButton: React.FC<CardButtonProps> = ({
     }
   }, [count]);
 
+  useEffect(() => {
+    setCount(initialValue);
+  }, [initialValue]);
+
   const incrementCount = () => {
     setCount((prev) => prev + 1);
   };
diff --git a/src/components/Carousel.tsx b/src/components/Carousel.tsx
index c9c54ac..290385b 100644
--- a/src/components/Carousel.tsx
+++ b/src/components/Carousel.tsx
@@ -1,15 +1,15 @@
 import React from 'react';
 import { View, StyleSheet, Dimensions, ScrollView } from 'react-native';
 import ProductCard from './Card';
-import { ProductPresentation } from '../types/api';
+import { Product } from '../types/Product';
 
 const { width: screenWidth } = Dimensions.get('window');
 
-type ProductCardProps = {
-  cards: ProductPresentation[];
+type CarouselProps = {
+  cards: Product[];
 };
 
-const Carrusel: React.FC<ProductCardProps> = ({ cards }) => {
+const Carousel: React.FC<CarouselProps> = ({ cards }) => {
   return (
     <ScrollView
       horizontal
@@ -18,15 +18,7 @@ const Carrusel: React.FC<ProductCardProps> = ({ cards }) => {
     >
       {cards.map((item, index) => (
         <View key={index} style={styles.card}>
-          <ProductCard
-            imageUrl={item?.imageUrl}
-            name={item?.name}
-            category={item?.category}
-            originalPrice={item?.originalPrice}
-            discount={item?.discount}
-            finalPrice={item?.finalPrice}
-            getQuantity={item?.getQuantity}
-          />
+          <ProductCard key={index} {...item} />
         </View>
       ))}
     </ScrollView>
@@ -44,4 +36,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default Carrusel;
+export default Carousel;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 5da1b6b..31b1e06 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -5,47 +5,52 @@ import PoppinsText from '../../components/PoppinsText';
 import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
 import { ProductService } from '../../services/products';
+import { Product } from '../../types/Product';
 
 export default function HomeScreen() {
-  const [products, setProducts] = useState([{}]);
-  const { addToCart, updateCartQuantity } = useCart();
+  const [products, setProducts] = useState<Product[]>([]);
+  const { cartItems, addToCart, updateCartQuantity } = useCart();
+
+  const getItemQuantity = (productId: number) => {
+    const cartItem = cartItems.find((item) => item.id === productId.toString());
+    return cartItem ? cartItem.quantity : 0;
+  };
 
   const obtainProducts = async () => {
     const productsData = await ProductService.getProducts(1, 20);
 
     if (productsData.success) {
       const pd = productsData.data.results;
-      const carouselProducts: object[] = [];
-
-      pd.forEach((p) => {
-        carouselProducts.push({
-          id: p.product.id,
-          imageUrl: p.product.images[0].url,
-          name: p.product.genericName,
-          category: p.product.categories[0].name,
-          originalPrice: p.price,
-          discount: 10,
-          finalPrice: p.price - p.price * 0.1,
-          getQuantity: (quantity: number) => {
-            addToCart({
-              id: p.product.id,
-              name: p.product.genericName,
-              price: p.price,
-              quantity,
-              image: p.product.images[0].url,
-            });
-            updateCartQuantity(p.product.id, quantity);
-          },
-        });
-      });
+      const carouselProducts = pd.map((p) => ({
+        id: p.product.id,
+        imageUrl: p.product.images[0].url,
+        name: p.product.genericName,
+        category: p.product.categories[0].name,
+        originalPrice: p.price,
+        discount: 10,
+        finalPrice: p.price - p.price * 0.1,
+        quantity: getItemQuantity(p.product.id),
+        getQuantity: (quantity: number) => {
+          addToCart({
+            id: p.product.id,
+            name: p.product.genericName,
+            price: p.price,
+            quantity,
+            image: p.product.images[0].url,
+          });
+          updateCartQuantity(p.product.id, quantity);
+        },
+      }));
 
       setProducts(carouselProducts);
-    } else console.log(productsData.error);
+    } else {
+      console.log(productsData.error);
+    }
   };
 
   useEffect(() => {
     obtainProducts();
-  }, []);
+  }, [cartItems]);
 
   return (
     <View testID="home-screen" style={styles.container}>
diff --git a/src/types/Product.ts b/src/types/Product.ts
new file mode 100644
index 0000000..8da8dd1
--- /dev/null
+++ b/src/types/Product.ts
@@ -0,0 +1,11 @@
+export type Product = {
+  id: string;
+  imageUrl: string;
+  name: string;
+  category: string;
+  originalPrice: number;
+  discount: number;
+  finalPrice: number;
+  quantity: number;
+  getQuantity: (quantity: number) => void;
+};

From 1b711c15b1afc6bf2fcc906343bbc60e3c7bd9f6 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 26 Mar 2025 00:45:01 -0400
Subject: [PATCH 009/291] Handling zero products properly in cartlist

---
 src/screens/CartListScreen.tsx | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index 4fbb39a..418838b 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -21,7 +21,7 @@ const CartListScreen = () => {
         <View style={styles.quantityContainer}>
           <CardButton
             getValue={(quantity) => updateCartQuantity(item.id, quantity)}
-            initialValue={item.quantity}
+            initialValue={item.quantity > 0 ? item.quantity : 0}
             syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
           />
         </View>
@@ -37,12 +37,18 @@ const CartListScreen = () => {
       <PoppinsText style={styles.header} weight="regular">
         Carrito de compras
       </PoppinsText>
-      <FlatList
-        data={cartItems}
-        renderItem={renderItem}
-        keyExtractor={(item) => item.id}
-        contentContainerStyle={styles.listContainer}
-      />
+      {cartItems.filter((item) => item.quantity > 0).length === 0 ? (
+        <PoppinsText style={styles.emptyCartText}>
+          Tu carrito está vacío
+        </PoppinsText>
+      ) : (
+        <FlatList
+          data={cartItems.filter((item) => item.quantity > 0)}
+          renderItem={renderItem}
+          keyExtractor={(item) => item.id}
+          contentContainerStyle={styles.listContainer}
+        />
+      )}
       <View style={styles.footer}>
         <PoppinsText style={styles.totalText}>Total: ${total}</PoppinsText>
         <TouchableOpacity style={styles.checkoutButton}>
@@ -134,6 +140,12 @@ const styles = StyleSheet.create({
     color: '#fff',
     fontWeight: '600',
   },
+  emptyCartText: {
+    fontSize: 16,
+    color: Colors.textMain,
+    textAlign: 'center',
+    marginTop: 20,
+  },
 });
 
 export default CartListScreen;

From 98edfacdd05e8bf95ff8482deb42776a860002d0 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 26 Mar 2025 23:20:43 -0400
Subject: [PATCH 010/291] Making cartlist look more like the design we have

---
 src/screens/CartListScreen.tsx | 86 +++++++++++++++++++++++++++-------
 1 file changed, 70 insertions(+), 16 deletions(-)

diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index 418838b..464d0ed 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -5,6 +5,7 @@ import CardButton from '../components/CardButton';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import type { CartItem } from '../redux/slices/cartSlice';
+import Button from '../components/Button';
 
 const CartListScreen = () => {
   const { cartItems, total, removeFromCart, updateCartQuantity } = useCart();
@@ -49,13 +50,30 @@ const CartListScreen = () => {
           contentContainerStyle={styles.listContainer}
         />
       )}
+      <View style={styles.footerBackground} />
       <View style={styles.footer}>
-        <PoppinsText style={styles.totalText}>Total: ${total}</PoppinsText>
-        <TouchableOpacity style={styles.checkoutButton}>
-          <PoppinsText style={styles.checkoutText}>
-            Proceder al Pago
-          </PoppinsText>
-        </TouchableOpacity>
+        <View style={styles.row}>
+          <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
+          <PoppinsText style={styles.subtotalText}>${total}</PoppinsText>
+        </View>
+        <View style={styles.row}>
+          <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
+          <PoppinsText style={styles.discountText}>$0.00</PoppinsText>
+        </View>
+        <View style={styles.row}>
+          <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
+          <PoppinsText style={styles.ivaText}>$0.00</PoppinsText>
+        </View>
+        <View style={styles.row}>
+          <PoppinsText style={styles.totalText}>Total</PoppinsText>
+          <PoppinsText style={styles.totalText}>${total}</PoppinsText>
+        </View>
+        <Button
+          title="Ir a pagar"
+          onPress={() => {}}
+          style={styles.checkoutButton}
+          size="medium"
+        />
       </View>
     </View>
   );
@@ -70,7 +88,7 @@ const styles = StyleSheet.create({
   header: {
     fontSize: FontSizes.h5.size,
     lineHeight: FontSizes.h5.lineHeight,
-    marginBottom: 16,
+    marginBottom: 24,
     color: Colors.textMain,
   },
   listContainer: {
@@ -100,8 +118,8 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   productName: {
-    fontSize: 16,
-    fontWeight: '500',
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
     marginBottom: 8,
   },
   productPrice: {
@@ -118,22 +136,34 @@ const styles = StyleSheet.create({
     fontSize: 14,
     color: Colors.semanticDanger,
   },
+  footerBackground: {
+    borderTopWidth: 1,
+    borderTopColor: '#e0e0e0',
+    position: 'absolute',
+    bottom: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: Colors.menuWhite,
+    paddingTop: 310,
+    alignItems: 'center',
+  },
   footer: {
     borderTopWidth: 1,
     borderTopColor: '#e0e0e0',
-    paddingTop: 16,
+    paddingTop: 44,
     alignItems: 'center',
+    position: 'relative',
   },
   totalText: {
-    fontSize: 18,
-    fontWeight: '600',
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
     marginBottom: 16,
   },
   checkoutButton: {
-    backgroundColor: Colors.primary,
-    paddingVertical: 12,
-    paddingHorizontal: 24,
-    borderRadius: 8,
+    marginBottom: 16,
+    width: '100%',
+    height: 50,
   },
   checkoutText: {
     fontSize: 16,
@@ -146,6 +176,30 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     marginTop: 20,
   },
+  subtotalText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 8,
+  },
+  discountText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.secondary,
+    marginBottom: 8,
+  },
+  ivaText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 20,
+  },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    width: '100%',
+    marginBottom: 8,
+  },
 });
 
 export default CartListScreen;

From c881cee018fb97c2863310ad2e66e035b3f251ca Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 27 Mar 2025 19:36:16 -0400
Subject: [PATCH 011/291] Finishing cartlist feature

---
 src/app/_layout.tsx            |  18 +-
 src/screens/CartListScreen.tsx | 293 +++++++++++++++++++++++----------
 src/screens/tab/HomeScreen.tsx |   4 +-
 src/styles/theme.ts            |   4 +
 4 files changed, 227 insertions(+), 92 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 77662fa..96c295b 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -13,9 +13,9 @@ import {
   Poppins_600SemiBold,
 } from '@expo-google-fonts/poppins';
 import { Stack } from 'expo-router/stack';
-import { ChevronLeftIcon } from 'react-native-heroicons/outline';
-import { Provider } from 'react-redux'; // Importa el Provider de Redux
-import { store } from '../redux/store'; // Importa el store de Redux
+import { ChevronLeftIcon, XMarkIcon } from 'react-native-heroicons/outline';
+import { Provider } from 'react-redux';
+import { store } from '../redux/store';
 
 SplashScreen.preventAutoHideAsync();
 
@@ -42,7 +42,6 @@ export default function RootLayout() {
 
   return (
     <Provider store={store}>
-      {/* Envuelve el Stack con el Provider */}
       <Stack
         screenOptions={({ navigation }) => ({
           headerBackVisible: false,
@@ -72,7 +71,16 @@ export default function RootLayout() {
         />
         <Stack.Screen
           name="cart"
-          options={{ headerTitle: '', headerTransparent: true }}
+          options={({ navigation }) => ({
+            headerTitle: '',
+            headerTransparent: true,
+            headerLeft: undefined,
+            headerRight: () => (
+              <TouchableOpacity onPress={() => navigation.goBack()}>
+                <XMarkIcon width={24} height={24} color="#000" />
+              </TouchableOpacity>
+            ),
+          })}
         />
       </Stack>
     </Provider>
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index 464d0ed..baebc64 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -1,80 +1,158 @@
 import React from 'react';
-import { View, FlatList, StyleSheet, TouchableOpacity } from 'react-native';
+import {
+  View,
+  FlatList,
+  StyleSheet,
+  TouchableOpacity,
+  Image,
+} from 'react-native';
 import { useCart } from '../hooks/useCart';
 import CardButton from '../components/CardButton';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import type { CartItem } from '../redux/slices/cartSlice';
 import Button from '../components/Button';
+import { TrashIcon } from 'react-native-heroicons/outline';
+import { useRouter } from 'expo-router';
 
 const CartListScreen = () => {
-  const { cartItems, total, removeFromCart, updateCartQuantity } = useCart();
+  const router = useRouter();
+  const { cartItems, removeFromCart, updateCartQuantity } = useCart();
 
-  const renderItem = ({ item }: { item: CartItem }) => (
-    <View style={styles.card}>
-      <View style={styles.imageContainer}>
-        <PoppinsText>Imagen</PoppinsText>
-        {/* Image */}
-      </View>
-      <View style={styles.detailsContainer}>
-        <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
-        <PoppinsText style={styles.productPrice}>${item.price}</PoppinsText>
-        <View style={styles.quantityContainer}>
-          <CardButton
-            getValue={(quantity) => updateCartQuantity(item.id, quantity)}
-            initialValue={item.quantity > 0 ? item.quantity : 0}
-            syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
+  const subtotal = cartItems.reduce(
+    (sum, item) => sum + item.price * item.quantity,
+    0,
+  ); // Total price sum
+  const totalDiscount = cartItems.reduce(
+    (sum, item) => sum + item.price * (item.quantity * 0.1), // 12% discount
+    0,
+  ); // Discount sum
+  const iva = (subtotal - totalDiscount) * 0.12; // 10% subtotal minus discount
+  const total = subtotal - totalDiscount + iva; // Subtotal, discount and IVA sum
+
+  const renderItem = ({ item }: { item: CartItem }) => {
+    const discount = 10; // Discount percentage
+    const discountedPrice = item.price * (1 - discount / 100); // Unit price discount
+    const totalDiscountedPrice = discountedPrice * item.quantity; // Total price with discount
+    const totalOriginalPrice = item.price * item.quantity; // Original total price
+
+    return (
+      <View style={styles.card}>
+        <View style={styles.imageContainer}>
+          {/* Discount badge */}
+          <View style={styles.discountBadge}>
+            <PoppinsText style={styles.discountBadgeText}>
+              -{discount}%
+            </PoppinsText>
+          </View>
+          <Image
+            source={{ uri: item.image }}
+            style={styles.productImage}
+            resizeMode="cover"
           />
         </View>
-        <TouchableOpacity onPress={() => removeFromCart(item.id)}>
-          <PoppinsText style={styles.removeText}>Eliminar</PoppinsText>
-        </TouchableOpacity>
+        <View style={styles.detailsContainer}>
+          <View style={styles.row}>
+            <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
+            <PoppinsText style={styles.productTotalPrice}>
+              ${totalDiscountedPrice.toFixed(2)}
+              {/* Total price with discount */}
+            </PoppinsText>
+          </View>
+          <PoppinsText style={styles.productOriginalPrice}>
+            ${totalOriginalPrice.toFixed(2)}
+            {/* Original total price */}
+          </PoppinsText>
+          <PoppinsText style={styles.productPrice}>
+            (${item.price} c/u)
+          </PoppinsText>
+          <View style={styles.quantityContainer}>
+            <CardButton
+              getValue={(quantity) => updateCartQuantity(item.id, quantity)}
+              initialValue={item.quantity > 0 ? item.quantity : 0}
+              syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
+            />
+            <TouchableOpacity
+              onPress={() => removeFromCart(item.id)}
+              style={styles.trashIconContainer}
+            >
+              <TrashIcon size={24} color={Colors.iconCancel} />
+            </TouchableOpacity>
+          </View>
+        </View>
       </View>
-    </View>
-  );
+    );
+  };
+
+  const isCartEmpty =
+    cartItems.filter((item) => item.quantity > 0).length === 0;
 
   return (
     <View style={styles.container}>
       <PoppinsText style={styles.header} weight="regular">
         Carrito de compras
       </PoppinsText>
-      {cartItems.filter((item) => item.quantity > 0).length === 0 ? (
-        <PoppinsText style={styles.emptyCartText}>
-          Tu carrito está vacío
-        </PoppinsText>
+      {isCartEmpty ? (
+        <View style={styles.emptyCartContainer}>
+          <PoppinsText style={styles.emptyCartText}>
+            Aún no tienes productos en tu carrito
+          </PoppinsText>
+          <PoppinsText style={styles.emptyCartText1}>
+            Explora y encuentra lo que buscas
+          </PoppinsText>
+          <Button
+            title="Ver productos disponibles"
+            onPress={() => {
+              router.replace('/(tabs)');
+            }}
+            size="medium"
+            style={styles.emptyCartButton}
+          />
+        </View>
       ) : (
-        <FlatList
-          data={cartItems.filter((item) => item.quantity > 0)}
-          renderItem={renderItem}
-          keyExtractor={(item) => item.id}
-          contentContainerStyle={styles.listContainer}
-        />
+        <>
+          <FlatList
+            data={cartItems.filter((item) => item.quantity > 0)}
+            renderItem={renderItem}
+            keyExtractor={(item) => item.id}
+            contentContainerStyle={styles.listContainer}
+            showsVerticalScrollIndicator={false}
+          />
+          <View style={styles.footerBackground} />
+          <View style={styles.footer}>
+            <View style={styles.row}>
+              <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
+              <PoppinsText style={styles.subtotalText}>
+                ${subtotal.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
+              <PoppinsText style={styles.discountText}>
+                -${totalDiscount.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
+              <PoppinsText style={styles.ivaText}>
+                ${iva.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.totalText}>Total</PoppinsText>
+              <PoppinsText style={styles.totalText}>
+                ${total.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <Button
+              title="Ir a pagar"
+              onPress={() => {}}
+              style={styles.checkoutButton}
+              size="medium"
+            />
+          </View>
+        </>
       )}
-      <View style={styles.footerBackground} />
-      <View style={styles.footer}>
-        <View style={styles.row}>
-          <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
-          <PoppinsText style={styles.subtotalText}>${total}</PoppinsText>
-        </View>
-        <View style={styles.row}>
-          <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
-          <PoppinsText style={styles.discountText}>$0.00</PoppinsText>
-        </View>
-        <View style={styles.row}>
-          <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
-          <PoppinsText style={styles.ivaText}>$0.00</PoppinsText>
-        </View>
-        <View style={styles.row}>
-          <PoppinsText style={styles.totalText}>Total</PoppinsText>
-          <PoppinsText style={styles.totalText}>${total}</PoppinsText>
-        </View>
-        <Button
-          title="Ir a pagar"
-          onPress={() => {}}
-          style={styles.checkoutButton}
-          size="medium"
-        />
-      </View>
     </View>
   );
 };
@@ -96,20 +174,16 @@ const styles = StyleSheet.create({
   },
   card: {
     flexDirection: 'row',
-    backgroundColor: '#fff',
     borderRadius: 8,
-    padding: 16,
-    marginBottom: 16,
-    shadowColor: '#000',
-    shadowOpacity: 0.1,
-    shadowRadius: 4,
-    elevation: 2,
+    marginBottom: 24,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.gray_100,
+    paddingBottom: 18,
   },
   imageContainer: {
-    width: 80,
-    height: 80,
-    backgroundColor: '#f0f0f0',
-    borderRadius: 8,
+    width: 100,
+    height: 100,
+
     justifyContent: 'center',
     alignItems: 'center',
     marginRight: 16,
@@ -118,27 +192,31 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   productName: {
-    fontSize: FontSizes.b2.size,
-    lineHeight: FontSizes.b2.lineHeight,
-    marginBottom: 8,
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    width: '50%',
   },
   productPrice: {
-    fontSize: 14,
-    color: Colors.secondary,
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+    marginBottom: 2,
+  },
+  productTotalPrice: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
     marginBottom: 8,
   },
   quantityContainer: {
     flexDirection: 'row',
-    alignItems: 'center',
-    marginBottom: 8,
+    left: -10,
   },
   removeText: {
     fontSize: 14,
     color: Colors.semanticDanger,
   },
   footerBackground: {
-    borderTopWidth: 1,
-    borderTopColor: '#e0e0e0',
     position: 'absolute',
     bottom: 0,
     left: 0,
@@ -148,8 +226,6 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   footer: {
-    borderTopWidth: 1,
-    borderTopColor: '#e0e0e0',
     paddingTop: 44,
     alignItems: 'center',
     position: 'relative',
@@ -165,16 +241,18 @@ const styles = StyleSheet.create({
     width: '100%',
     height: 50,
   },
-  checkoutText: {
-    fontSize: 16,
-    color: '#fff',
-    fontWeight: '600',
-  },
   emptyCartText: {
-    fontSize: 16,
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
+    color: Colors.textMain,
+    textAlign: 'center',
+    marginBottom: 4,
+  },
+  emptyCartText1: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textMain,
     textAlign: 'center',
-    marginTop: 20,
   },
   subtotalText: {
     fontSize: FontSizes.b1.size,
@@ -200,6 +278,51 @@ const styles = StyleSheet.create({
     width: '100%',
     marginBottom: 8,
   },
+  productImage: {
+    width: '100%',
+    height: '100%',
+    marginTop: 16,
+  },
+  trashIconContainer: {
+    position: 'absolute',
+    bottom: 16,
+    right: -10,
+  },
+  discountBadge: {
+    zIndex: 999,
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    backgroundColor: Colors.semanticWarning,
+    borderRadius: 50,
+    paddingHorizontal: 6,
+    paddingVertical: 2,
+  },
+  discountBadgeText: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.primary,
+  },
+  productOriginalPrice: {
+    position: 'absolute',
+    right: 0,
+    top: 24,
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+    textDecorationLine: 'line-through',
+    marginBottom: 8,
+  },
+  emptyCartContainer: {
+    flex: 1,
+    width: '75%',
+    justifyContent: 'center',
+    alignItems: 'center',
+    alignSelf: 'center',
+  },
+  emptyCartButton: {
+    marginTop: 16,
+  },
 });
 
 export default CartListScreen;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 31b1e06..b56771f 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -24,7 +24,7 @@ export default function HomeScreen() {
       const carouselProducts = pd.map((p) => ({
         id: p.product.id,
         imageUrl: p.product.images[0].url,
-        name: p.product.genericName,
+        name: p.product.name,
         category: p.product.categories[0].name,
         originalPrice: p.price,
         discount: 10,
@@ -33,7 +33,7 @@ export default function HomeScreen() {
         getQuantity: (quantity: number) => {
           addToCart({
             id: p.product.id,
-            name: p.product.genericName,
+            name: p.product.name,
             price: p.price,
             quantity,
             image: p.product.images[0].url,
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 3630df4..91a841e 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -23,12 +23,16 @@ export const Colors = {
   iconWhite: '#FFFFFF',
   iconMainPrimary: '#1C2143',
   iconMainSecondary: '#A3E4D7',
+  iconCancel: '#FF5959',
 
   menuWhite: '#FFFFFF',
   menuPrimary: '#1C2143',
 
   toggleOn: '#1C2143',
   toggleOff: '#D7D5D3',
+
+  gray_100: '#E7E7E6',
+  gray_500: '#6E6D6C',
 };
 
 export const Fonts = {

From fd8048ff22ba2de2a58f67b2ccff4e060199e0ac Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 11:38:15 -0400
Subject: [PATCH 012/291] Design changes

---
 src/screens/PasswordChangeScreen.tsx | 34 ++++++++++++++++------------
 src/screens/tab/CategoriesScreen.tsx |  7 ++++++
 2 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index 83ef806..f810500 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -114,17 +114,18 @@ export default function ChangePasswordScreen() {
       </View>
 
       {/* Enlace de recuperación de contraseña */}
-      <TouchableOpacity
-        onPress={() => router.push('/recover-password')}
-        style={styles.forgotPasswordContainer}
-      >
-        <PoppinsText weight="regular" style={styles.forgotPasswordText}>
-          ¿Olvidaste tu contraseña?{' '}
-          <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
-            Ingresa aquí
+      <View style={styles.forgotPasswordContainer}>
+        <View style={styles.forgotPasswordRow}>
+          <PoppinsText weight="regular" style={styles.forgotPasswordText}>
+            ¿Olvidaste tu contraseña?{' '}
           </PoppinsText>
-        </PoppinsText>
-      </TouchableOpacity>
+          <TouchableOpacity onPress={() => router.push('/passwordRecovery')}>
+            <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
+              Ingresa aquí
+            </PoppinsText>
+          </TouchableOpacity>
+        </View>
+      </View>
 
       <Button
         title="Continuar"
@@ -149,11 +150,10 @@ const styles = StyleSheet.create({
   title: {
     fontSize: FontSizes.h4.size,
     lineHeight: FontSizes.h4.lineHeight,
-    marginBottom: 10,
+    marginBottom: 24,
     color: Colors.textMain,
   },
   description: {
-    marginTop: 30,
     fontSize: FontSizes.b1.size,
     lineHeight: FontSizes.b1.lineHeight,
     textAlign: 'center',
@@ -172,7 +172,7 @@ const styles = StyleSheet.create({
     width: '100%',
   },
   inputGroup: {
-    marginBottom: 24, // Aumenta la separación entre los campos
+    marginBottom: 16,
   },
   changePasswordButton: {
     marginTop: 16,
@@ -180,7 +180,11 @@ const styles = StyleSheet.create({
     height: 50,
   },
   forgotPasswordContainer: {
-    marginTop: 5,
+    alignSelf: 'flex-start',
+  },
+  forgotPasswordRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
   },
   forgotPasswordText: {
     fontSize: FontSizes.b3.size,
@@ -190,7 +194,7 @@ const styles = StyleSheet.create({
   forgotPasswordLink: {
     fontSize: FontSizes.b3.size,
     lineHeight: FontSizes.b3.lineHeight,
-    color: Colors.secondaryLight, // Color azul claro para indicar que es un enlace
+    color: Colors.secondaryLight,
   },
   button: {
     marginTop: 24,
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index 1ecbcbc..a607473 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -47,6 +47,13 @@ export default function CategoriesScreen() {
         mode="filled"
         size="large"
       />
+      <Button
+        title="Change password"
+        onPress={() => router.push('/change-password')}
+        variant="primary"
+        mode="filled"
+        size="large"
+      />
     </View>
   );
 }

From 43191b8abc7fc2fe0bbb27de5b78164530065e12 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 13:34:44 -0400
Subject: [PATCH 013/291] Integrating endpoint

---
 src/screens/PasswordChangeScreen.tsx | 224 ++++++++++++++++-----------
 src/services/auth.ts                 |  13 ++
 2 files changed, 147 insertions(+), 90 deletions(-)

diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index f810500..04c39a8 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -1,10 +1,18 @@
 import React, { useState } from 'react';
-import { View, Alert, StyleSheet, TouchableOpacity } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  TouchableOpacity,
+  KeyboardAvoidingView,
+  ScrollView,
+} from 'react-native';
 import { useRouter } from 'expo-router';
 import Button from '../components/Button';
 import Input from '../components/Input';
 import PoppinsText from '../components/PoppinsText';
+import Alert from '../components/Alerts';
 import { Colors, FontSizes } from '../styles/theme';
+import { AuthService } from '../services/auth';
 
 export default function ChangePasswordScreen() {
   const router = useRouter();
@@ -12,18 +20,33 @@ export default function ChangePasswordScreen() {
   const [newPassword, setNewPassword] = useState('');
   const [confirmPassword, setConfirmPassword] = useState('');
   const [loading, setLoading] = useState(false);
-  // const api = new PharmaTech(true);
+  const [alert, setAlert] = useState({
+    visible: false,
+    type: 'info',
+    title: '',
+    message: '',
+  });
+
+  const showAlert = (
+    type: 'success' | 'error' | 'info',
+    title: string,
+    message: string,
+  ) => {
+    setAlert({ visible: true, type, title, message });
+    setTimeout(() => setAlert({ ...alert, visible: false }), 3000);
+  };
 
   const handleChangePassword = async () => {
     if (loading) return;
 
-    if (!currentPassword || !newPassword || !confirmPassword) {
-      Alert.alert('Error', 'Todos los campos son obligatorios.');
+    if (!newPassword || !confirmPassword) {
+      showAlert('error', 'Error', 'Todos los campos son obligatorios.');
       return;
     }
 
     if (newPassword.length < 8) {
-      Alert.alert(
+      showAlert(
+        'error',
         'Error',
         'La nueva contraseña debe tener al menos 8 caracteres.',
       );
@@ -31,110 +54,123 @@ export default function ChangePasswordScreen() {
     }
 
     if (newPassword !== confirmPassword) {
-      Alert.alert('Error', 'Las contraseñas no coinciden.');
-      return;
-    }
-
-    if (newPassword === currentPassword) {
-      Alert.alert(
-        'Error',
-        'La nueva contraseña debe ser diferente a la actual.',
-      );
+      showAlert('error', 'Error', 'Las contraseñas no coinciden.');
       return;
     }
 
     setLoading(true);
     try {
-      //await api.auth.changePassword({ currentPassword, newPassword });
-      Alert.alert('Éxito', 'Contraseña cambiada correctamente.', [
-        {
-          text: 'OK',
-          onPress: () => router.replace('/categories'),
-        },
-      ]);
+      const result = await AuthService.changePassword(newPassword);
+      if (result.success) {
+        showAlert('success', 'Éxito', 'Contraseña cambiada correctamente.');
+        setTimeout(() => router.replace('/categories'), 3000);
+      } else {
+        showAlert(
+          'error',
+          'Error',
+          result.error || 'No se pudo cambiar la contraseña.',
+        );
+      }
     } catch (error) {
       console.error('Error al cambiar la contraseña:', error);
-      Alert.alert(
-        'Error',
-        'No se pudo cambiar la contraseña, verifica tus datos.',
-      );
+      showAlert('error', 'Error', 'Ocurrió un error inesperado.');
     } finally {
       setLoading(false);
     }
   };
 
   return (
-    <View style={styles.container}>
-      {/* Título */}
-      <PoppinsText weight="medium" style={styles.title}>
-        Cambiar Contraseña
-      </PoppinsText>
-
-      {/* Descripción debajo del título */}
-      <PoppinsText weight="regular" style={styles.description}>
-        Crea una nueva contraseña.
-      </PoppinsText>
-      <PoppinsText weight="regular" style={styles.description2}>
-        Asegúrate de que sea diferente a las anteriores por seguridad.
-      </PoppinsText>
-      <View style={styles.inputsContainer}>
-        <View style={styles.inputGroup}>
-          <Input
-            label="Contraseña Actual"
-            placeholder="Ingresa tu contraseña actual"
-            value={currentPassword}
-            fieldType="password"
-            getValue={setCurrentPassword}
-            backgroundColor={Colors.menuWhite}
-          />
-        </View>
-
-        <View style={styles.inputGroup}>
-          <Input
-            label="Contraseña Nueva"
-            placeholder="Ingresa tu nueva contraseña"
-            value={newPassword}
-            fieldType="password"
-            getValue={setNewPassword}
-            backgroundColor={Colors.menuWhite}
-            errorText="Debe tener al menos 8 caracteres"
+    <KeyboardAvoidingView style={{ flex: 1 }}>
+      {/* Contenedor de la alerta personalizada */}
+      {alert.visible && (
+        <View style={styles.alertContainer}>
+          <Alert
+            type={alert.type as 'success' | 'error' | 'info'}
+            title={alert.title}
+            message={alert.message}
+            alertStyle="regular"
+            borderColor
+            onClose={() => setAlert({ ...alert, visible: false })}
           />
         </View>
+      )}
 
-        <View style={styles.inputGroup}>
-          <Input
-            label="Repetir Nueva Contraseña"
-            placeholder="Repite tu nueva contraseña"
-            value={confirmPassword}
-            fieldType="password"
-            getValue={setConfirmPassword}
-            backgroundColor={Colors.menuWhite}
-          />
-        </View>
-      </View>
+      <ScrollView contentContainerStyle={{ flexGrow: 1 }}>
+        <View style={styles.container}>
+          {/* Título */}
+          <PoppinsText weight="medium" style={styles.title}>
+            Cambiar Contraseña
+          </PoppinsText>
 
-      {/* Enlace de recuperación de contraseña */}
-      <View style={styles.forgotPasswordContainer}>
-        <View style={styles.forgotPasswordRow}>
-          <PoppinsText weight="regular" style={styles.forgotPasswordText}>
-            ¿Olvidaste tu contraseña?{' '}
+          {/* Descripción debajo del título */}
+          <PoppinsText weight="regular" style={styles.description}>
+            Crea una nueva contraseña.
           </PoppinsText>
-          <TouchableOpacity onPress={() => router.push('/passwordRecovery')}>
-            <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
-              Ingresa aquí
-            </PoppinsText>
-          </TouchableOpacity>
-        </View>
-      </View>
+          <PoppinsText weight="regular" style={styles.description2}>
+            Asegúrate de que sea diferente a las anteriores por seguridad.
+          </PoppinsText>
+          <View style={styles.inputsContainer}>
+            <View style={styles.inputGroup}>
+              <Input
+                label="Contraseña Actual"
+                placeholder="Ingresa tu contraseña actual"
+                value={currentPassword}
+                fieldType="password"
+                getValue={setCurrentPassword}
+                backgroundColor={Colors.menuWhite}
+              />
+            </View>
 
-      <Button
-        title="Continuar"
-        onPress={handleChangePassword}
-        style={styles.button}
-        size="medium"
-        loading={loading}
-      />
-    </View>
+            <View style={styles.inputGroup}>
+              <Input
+                label="Contraseña Nueva"
+                placeholder="Ingresa tu nueva contraseña"
+                value={newPassword}
+                fieldType="password"
+                getValue={setNewPassword}
+                backgroundColor={Colors.menuWhite}
+                errorText="Debe tener al menos 8 caracteres"
+              />
+            </View>
+
+            <View style={styles.inputGroup}>
+              <Input
+                label="Repetir Nueva Contraseña"
+                placeholder="Repite tu nueva contraseña"
+                value={confirmPassword}
+                fieldType="password"
+                getValue={setConfirmPassword}
+                backgroundColor={Colors.menuWhite}
+              />
+            </View>
+          </View>
+
+          {/* Enlace de recuperación de contraseña */}
+          <View style={styles.forgotPasswordContainer}>
+            <View style={styles.forgotPasswordRow}>
+              <PoppinsText weight="regular" style={styles.forgotPasswordText}>
+                ¿Olvidaste tu contraseña?{' '}
+              </PoppinsText>
+              <TouchableOpacity
+                onPress={() => router.push('/passwordRecovery')}
+              >
+                <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
+                  Ingresa aquí
+                </PoppinsText>
+              </TouchableOpacity>
+            </View>
+          </View>
+
+          <Button
+            title="Continuar"
+            onPress={handleChangePassword}
+            style={styles.button}
+            size="medium"
+            loading={loading}
+          />
+        </View>
+      </ScrollView>
+    </KeyboardAvoidingView>
   );
 }
 
@@ -147,6 +183,14 @@ const styles = StyleSheet.create({
     paddingTop: 100,
     paddingHorizontal: 20,
   },
+  alertContainer: {
+    position: 'absolute',
+    top: 0,
+    left: 2,
+    right: 0,
+    zIndex: 1000,
+    padding: 16,
+  },
   title: {
     fontSize: FontSizes.h4.size,
     lineHeight: FontSizes.h4.lineHeight,
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 9db1b13..354c81c 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -131,4 +131,17 @@ export const AuthService = {
       };
     }
   },
+
+  changePassword: async (newPassword: string): Promise<ServiceResponse> => {
+    try {
+      const token = (await SecureStore.getItemAsync('auth_token')) || '';
+      await api.auth.updatePassword(newPassword.trim(), token);
+      return { success: true, data: undefined };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From d4fe15fcc4e5edad55cfb57f1b673e052068bf70 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 14:29:01 -0400
Subject: [PATCH 014/291] Fixing using global styles

---
 src/components/Toggle.tsx | 36 +++++++++++++++++++++---------------
 src/styles/theme.ts       |  7 +++++++
 2 files changed, 28 insertions(+), 15 deletions(-)

diff --git a/src/components/Toggle.tsx b/src/components/Toggle.tsx
index 77b5ef7..2d8eaf9 100644
--- a/src/components/Toggle.tsx
+++ b/src/components/Toggle.tsx
@@ -1,27 +1,32 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { Pressable, Animated, StyleSheet } from 'react-native';
-import { Colors } from '../styles/theme';
+import { Colors, ToggleSizes } from '../styles/theme';
 
 interface ToggleProps {
   value?: boolean;
   onChange?: (newValue: boolean) => void;
   disabled?: boolean;
+  size?: 'small' | 'medium' | 'large';
 }
 
-const TOGGLE_CONFIG = {
-  width: 55,
-  height: 32,
-  radius: 30,
-  circleSize: 26, // Ajustado para que el círculo quede bien dentro del switch
-};
-
 const Toggle: React.FC<ToggleProps> = ({
   value = false,
   onChange,
   disabled = false,
+  size = 'medium',
 }) => {
   const [toggleValue, setToggleValue] = useState(value);
   const animatedValue = new Animated.Value(value ? 1 : 0);
+  const config = ToggleSizes[size];
+
+  useEffect(() => {
+    setToggleValue(value);
+    Animated.timing(animatedValue, {
+      toValue: value ? 1 : 0,
+      duration: 200,
+      useNativeDriver: false,
+    }).start();
+  }, [value]);
 
   const handleToggle = () => {
     if (disabled) return;
@@ -38,7 +43,7 @@ const Toggle: React.FC<ToggleProps> = ({
 
   const translateX = animatedValue.interpolate({
     inputRange: [0, 1],
-    outputRange: [2, TOGGLE_CONFIG.width - TOGGLE_CONFIG.circleSize - 2],
+    outputRange: [2, config.width - config.circleSize - 2],
   });
 
   return (
@@ -47,10 +52,10 @@ const Toggle: React.FC<ToggleProps> = ({
       style={[
         styles.toggleBase,
         {
-          width: TOGGLE_CONFIG.width,
-          height: TOGGLE_CONFIG.height,
+          width: config.width,
+          height: config.height,
           backgroundColor: toggleValue ? Colors.toggleOn : Colors.toggleOff,
-          borderRadius: TOGGLE_CONFIG.radius,
+          borderRadius: config.radius,
         },
         disabled && styles.disabled,
       ]}
@@ -59,8 +64,8 @@ const Toggle: React.FC<ToggleProps> = ({
         style={[
           styles.circle,
           {
-            width: TOGGLE_CONFIG.circleSize,
-            height: TOGGLE_CONFIG.circleSize,
+            width: config.circleSize,
+            height: config.circleSize,
             transform: [{ translateX }],
           },
         ]}
@@ -81,6 +86,7 @@ const styles = StyleSheet.create({
   },
   disabled: {
     opacity: 0.5,
+    backgroundColor: Colors.stroke,
   },
 });
 
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 3630df4..2db10c5 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -63,8 +63,15 @@ export const FontSizes = {
   btnTiny: { size: 10, lineHeight: 12 },
 };
 
+export const ToggleSizes = {
+  small: { width: 40, height: 24, circleSize: 18, radius: 12 },
+  medium: { width: 55, height: 32, circleSize: 26, radius: 16 },
+  large: { width: 70, height: 40, circleSize: 34, radius: 20 },
+};
+
 export default {
   Colors,
   Fonts,
   FontSizes,
+  ToggleSizes,
 };

From b4ea6546496c9bf0315de43ebc5d9747b600716a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 15:11:31 -0400
Subject: [PATCH 015/291] Deleting content from categories that I forgot to
 erase from last PR

---
 src/screens/tab/CategoriesScreen.tsx | 23 -----------------------
 1 file changed, 23 deletions(-)

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index 52c6d96..1ecbcbc 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -6,14 +6,10 @@ import { useRouter } from 'expo-router';
 import { Colors } from '../../styles/theme';
 import * as SecureStore from 'expo-secure-store';
 import Popup from '../../components/Popup';
-import CartTotal from '../../components/CartTotal';
-import { useDispatch } from 'react-redux';
-import { addItem, removeItem } from '../../redux/slices/cartSlice';
 
 export default function CategoriesScreen() {
   const router = useRouter();
   const [showPopup, setShowPopup] = useState(false);
-  const dispatch = useDispatch();
 
   const handleLogout = async () => {
     try {
@@ -25,22 +21,6 @@ export default function CategoriesScreen() {
     }
   };
 
-  const handleAddToCart = () => {
-    dispatch(
-      addItem({
-        id: '1',
-        name: 'Camiseta Azul',
-        price: 20,
-        quantity: 1,
-        image: 'https://example.com/camiseta.jpg',
-      }),
-    );
-  };
-
-  const handleRemoveFromCart = () => {
-    dispatch(removeItem('1')); // Elimina el producto con ID '1'
-  };
-
   return (
     <View style={styles.container}>
       {/* Popup */}
@@ -67,9 +47,6 @@ export default function CategoriesScreen() {
         mode="filled"
         size="large"
       />
-      <CartTotal />
-      <Button title="Agregar al carrito" onPress={handleAddToCart} />
-      <Button title="Eliminar del carrito" onPress={handleRemoveFromCart} />
     </View>
   );
 }

From 8aeca6600eb09dd761914ab619bf1f9f06fafd4b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 15:37:46 -0400
Subject: [PATCH 016/291] Using more validations

---
 src/screens/PasswordChangeScreen.tsx | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index 04c39a8..7dd4752 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -39,7 +39,7 @@ export default function ChangePasswordScreen() {
   const handleChangePassword = async () => {
     if (loading) return;
 
-    if (!newPassword || !confirmPassword) {
+    if (!currentPassword || !newPassword || !confirmPassword) {
       showAlert('error', 'Error', 'Todos los campos son obligatorios.');
       return;
     }
@@ -58,6 +58,15 @@ export default function ChangePasswordScreen() {
       return;
     }
 
+    if (newPassword === currentPassword) {
+      showAlert(
+        'error',
+        'Error',
+        'La nueva contraseña debe ser diferente a la actual.',
+      );
+      return;
+    }
+
     setLoading(true);
     try {
       const result = await AuthService.changePassword(newPassword);

From 06ca80f271db7736c0c2d5301679e2721d0ec7eb Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 28 Mar 2025 19:14:46 -0400
Subject: [PATCH 017/291] Fixing avatar

---
 src/components/Avatar.tsx | 98 ++++++++++++++++++++++++++++-----------
 src/components/TopBar.tsx |  8 ++--
 src/helper/jwtHelper.ts   | 28 +++++++++++
 src/services/user.ts      | 33 +++++++++++++
 src/types/api.d.ts        | 12 +++++
 5 files changed, 147 insertions(+), 32 deletions(-)
 create mode 100644 src/helper/jwtHelper.ts
 create mode 100644 src/services/user.ts

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index b2cb67f..af863cd 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,56 +1,100 @@
-import React from 'react';
-import { Image, Text, View, StyleSheet } from 'react-native';
-import { Colors } from '../styles/theme';
+import React, { useEffect, useState } from 'react';
+import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import { UserService } from '../services/user';
+import { getUserIdFromSecureStore } from '../helper/jwtHelper';
+import PoppinsText from './PoppinsText';
 
-interface AvatarProps {
-  uri?: string; // URL de la imagen de perfil
-  name?: string; // Nombre completo del usuario
-}
+const Avatar: React.FC = () => {
+  const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
+  const [loading, setLoading] = useState(true);
 
-const Avatar: React.FC<AvatarProps> = ({ uri, name = '' }) => {
-  const dimension = 32; // Tamaño fijo
+  useEffect(() => {
+    const fetchProfile = async () => {
+      setLoading(true);
+
+      const userId = await getUserIdFromSecureStore();
+      console.log('User ID:', userId);
+      if (!userId) {
+        console.error('No se pudo obtener el ID del usuario');
+        setLoading(false);
+        return;
+      }
+
+      const response = await UserService.getProfile(userId);
+      console.log('Profile Response:', response);
+      if (response.success) {
+        const { firstName, lastName, profilePicture } = response.data!;
+        console.log('Profile Data:', { firstName, lastName, profilePicture });
+        setProfile({
+          uri: profilePicture,
+          name: `${firstName} ${lastName}`,
+        });
+      } else {
+        console.error('Error fetching profile:', response.error);
+      }
+      setLoading(false);
+    };
+
+    fetchProfile();
+  }, []);
 
-  // Función para obtener iniciales del nombre
   const getInitials = (fullName: string): string => {
+    console.log('Full Name:', fullName);
     const words = fullName.trim().split(' ');
     if (words.length === 1) return words[0].charAt(0).toUpperCase();
     return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
   };
 
+  if (loading) {
+    return (
+      <View style={[styles.avatarContainer, styles.loadingContainer]}>
+        <ActivityIndicator color={Colors.textWhite} />
+      </View>
+    );
+  }
+
   return (
-    <View
-      style={[
-        styles.avatarContainer,
-        { width: dimension, height: dimension, borderRadius: dimension / 2 },
-      ]}
-    >
-      {uri ? (
-        <Image
-          source={{ uri }}
-          style={[styles.avatarImage, { width: dimension, height: dimension }]}
-        />
+    <View style={styles.avatar}>
+      {profile.uri ? (
+        <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
       ) : (
-        <Text style={[styles.initials, { fontSize: dimension / 2.5 }]}>
-          {getInitials(name)}
-        </Text>
+        <PoppinsText style={styles.initials} weight="semibold">
+          {profile.name ? getInitials(profile.name) : ''}
+        </PoppinsText>
       )}
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  avatarContainer: {
-    backgroundColor: Colors.primary, // Color de fondo cuando no hay foto
+  avatar: {
+    width: 32,
+    height: 32,
+    borderRadius: 16,
+    backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
     overflow: 'hidden',
   },
   avatarImage: {
+    width: 32,
+    height: 32,
     resizeMode: 'cover',
   },
   initials: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textWhite,
-    fontWeight: 'bold',
+  },
+  avatarContainer: {
+    backgroundColor: Colors.primary,
+    alignItems: 'center',
+    justifyContent: 'center',
+    overflow: 'hidden',
+  },
+  loadingContainer: {
+    backgroundColor: Colors.stroke,
   },
 });
 
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index 17dcd2a..7d98cb2 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -1,13 +1,11 @@
 import React, { useState } from 'react';
 import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import {
-  UserCircleIcon,
-  ShoppingCartIcon,
-} from 'react-native-heroicons/outline';
+import { ShoppingCartIcon } from 'react-native-heroicons/outline';
 import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
 import { useRouter } from 'expo-router';
+import Avatar from './Avatar';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
@@ -24,7 +22,7 @@ const TopBar = () => {
       <View style={styles.topSection}>
         {/* Left user icon */}
         <TouchableOpacity style={styles.iconButton}>
-          <UserCircleIcon size={32} color={Colors.textMain} />
+          <Avatar />
         </TouchableOpacity>
 
         {/* Logo */}
diff --git a/src/helper/jwtHelper.ts b/src/helper/jwtHelper.ts
new file mode 100644
index 0000000..fa5ce0e
--- /dev/null
+++ b/src/helper/jwtHelper.ts
@@ -0,0 +1,28 @@
+import * as SecureStore from 'expo-secure-store';
+
+export const decodeJWT = (token: string): { userId: string } | null => {
+  try {
+    const payload = token.split('.')[1];
+    const decodedPayload = JSON.parse(atob(payload));
+    console.log('Decoded JWT Payload:', decodedPayload); // Checking JWT content
+    return { userId: decodedPayload.sub }; // `sub` is usually the user ID in JWTs
+  } catch (error) {
+    console.error('Error decoding JWT:', error);
+    return null;
+  }
+};
+
+export const getUserIdFromSecureStore = async (): Promise<string | null> => {
+  try {
+    const token = await SecureStore.getItemAsync('auth_token');
+    console.log('Retrieved Token:', token); // Chenking if the token is retrieved correctly
+    if (!token) return null;
+
+    const decoded = decodeJWT(token);
+    console.log('Decoded User ID:', decoded?.userId); // Checking the decoded user ID
+    return decoded?.userId || null;
+  } catch (error) {
+    console.error('Error retrieving user ID:', error);
+    return null;
+  }
+};
diff --git a/src/services/user.ts b/src/services/user.ts
new file mode 100644
index 0000000..a0abe3a
--- /dev/null
+++ b/src/services/user.ts
@@ -0,0 +1,33 @@
+import * as SecureStore from 'expo-secure-store';
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse, ProfileResponse } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const UserService = {
+  getProfile: async (
+    userId: string,
+  ): Promise<ServiceResponse<ProfileResponse>> => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Realiza la solicitud manualmente con el encabezado Authorization
+      const response = await api.user['client'].get({
+        url: `/user/${userId}`, // Ajusta la URL según el endpoint real
+        jwt: token, // El token se pasa como parte de la configuración
+      });
+
+      console.log('Profile Data:', response); // Verificar los datos del perfil
+      return { success: true, data: response as ProfileResponse };
+    } catch (error) {
+      console.error('Error fetching profile:', error);
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 3b09c30..c51c3ca 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -52,3 +52,15 @@ export type ProductPresentation = BaseModel & {
   presentation: Presentation;
   product: Product;
 };
+
+export interface ProfileResponse {
+  firstName: string;
+  lastName: string;
+  email: string;
+  documentId: string;
+  phoneNumber: string;
+  birthDate: Date;
+  gender: string;
+  profilePicture: string;
+  role: string;
+}

From 28ca7c1d433e1c5a14a463c3ed541a0fd1b4b2cd Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Fri, 28 Mar 2025 20:50:08 -0400
Subject: [PATCH 018/291] Refactor card component styles for improved layout
 and consistency

---
 src/components/Card.tsx       | 35 ++++++++++++++++++-----------------
 src/components/CardButton.tsx |  6 +++---
 src/components/Carousel.tsx   |  2 +-
 3 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index eb97771..36c987f 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -23,7 +23,7 @@ const ProductCard: React.FC<Product> = ({
       <View
         style={{
           width: '100%',
-          height: 160,
+          height: 135,
           marginBottom: 30,
         }}
       >
@@ -38,8 +38,8 @@ const ProductCard: React.FC<Product> = ({
         <View style={styles.imageContainer}>
           <Image
             source={{ uri: imageUrl }}
-            width={148}
-            height={140}
+            width={114}
+            height={118}
             style={{ borderRadius: 15 }}
           />
           <View style={styles.cardButtonContainer}>
@@ -83,38 +83,39 @@ const styles = StyleSheet.create({
     borderWidth: 1,
     borderColor: '#ccc',
     borderRadius: 15,
-    padding: 16,
+    padding: 10,
     paddingBottom: 5,
-    shadowColor: '#000',
-    shadowOffset: { width: 0, height: 2 },
-    shadowOpacity: 0.1,
-    shadowRadius: 4,
-    elevation: 3,
+    //shadowColor: '#000',
+    //shadowOffset: { width: 0, height: 2 },
+    //shadowOpacity: 0.1,
+    //shadowRadius: 4,
+    //elevation: 3,
     marginBottom: 16,
-    maxWidth: 170,
-    minWidth: 170,
-    minHeight: 330,
-    maxHeight: 330,
+    maxWidth: 140,
+    minWidth: 140,
+    minHeight: 300,
+    maxHeight: 300,
   },
   tag: {
     backgroundColor: Colors.semanticInfo,
     borderRadius: 50,
     paddingHorizontal: 9,
     color: Colors.textWhite,
-    fontSize: FontSizes.c2.size,
+    fontSize: FontSizes.c3.size,
     maxWidth: '100%',
   },
   imageContainer: {
     backgroundColor: Colors.secondaryGray,
-    minHeight: 140,
-    maxHeight: 140,
+    minHeight: 118,
+    maxHeight: 118,
+    maxWidth: 114,
     borderRadius: 15,
     marginVertical: 8,
   },
   cardButtonContainer: {
     position: 'relative',
     top: -30,
-    left: 63,
+    left: 58,
     maxWidth: '65%',
     alignItems: 'flex-end',
     zIndex: 999,
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index 265cf84..f311e59 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -95,8 +95,8 @@ const styles = StyleSheet.create({
   },
   mainButton: {
     backgroundColor: Colors.primary,
-    paddingVertical: 5,
-    paddingHorizontal: 5,
+    paddingVertical: 4,
+    paddingHorizontal: 4,
     borderRadius: 50,
     elevation: 3,
   },
@@ -106,7 +106,7 @@ const styles = StyleSheet.create({
     gap: 15,
     backgroundColor: Colors.primary,
     borderRadius: 50,
-    padding: 5,
+    padding: 4,
   },
   counterButton: {
     width: 20,
diff --git a/src/components/Carousel.tsx b/src/components/Carousel.tsx
index 290385b..e53eb93 100644
--- a/src/components/Carousel.tsx
+++ b/src/components/Carousel.tsx
@@ -30,7 +30,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   card: {
-    width: screenWidth - 170, // Ancho de cada card
+    width: screenWidth - 205, // Ancho de cada card
     borderRadius: 10,
     alignItems: 'center',
   },

From bbf59df841b1ce8d8598ea814e8302fe4c724084 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Fri, 28 Mar 2025 21:07:16 -0400
Subject: [PATCH 019/291] Refactor card and carousel components for improved
 styling and layout adjustments

---
 src/components/Card.tsx        | 12 ++++++------
 src/components/Carousel.tsx    |  4 ++--
 src/screens/tab/HomeScreen.tsx |  1 -
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 36c987f..eb0f1d4 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -40,7 +40,7 @@ const ProductCard: React.FC<Product> = ({
             source={{ uri: imageUrl }}
             width={114}
             height={118}
-            style={{ borderRadius: 15 }}
+            style={{ borderRadius: 14 }}
           />
           <View style={styles.cardButtonContainer}>
             <CardButton
@@ -93,7 +93,7 @@ const styles = StyleSheet.create({
     marginBottom: 16,
     maxWidth: 140,
     minWidth: 140,
-    minHeight: 300,
+    //minHeight: 300,
     maxHeight: 300,
   },
   tag: {
@@ -125,7 +125,7 @@ const styles = StyleSheet.create({
   },
   name: {
     fontSize: FontSizes.s2.size,
-    marginBottom: 8,
+    marginBottom: 6,
   },
   priceContainer: {
     flexDirection: 'row',
@@ -135,16 +135,16 @@ const styles = StyleSheet.create({
     fontSize: FontSizes.b1.size,
     color: Colors.disableText,
     textDecorationLine: 'line-through',
-    marginRight: 18,
+    marginRight: 14,
   },
   discount: {
     fontSize: FontSizes.c1.size,
     backgroundColor: Colors.semanticInfo,
     borderRadius: 5,
-    padding: 5,
+    padding: 4,
   },
   finalPrice: {
-    fontSize: 20,
+    fontSize: FontSizes.s1.size,
   },
 });
 
diff --git a/src/components/Carousel.tsx b/src/components/Carousel.tsx
index e53eb93..a80adb9 100644
--- a/src/components/Carousel.tsx
+++ b/src/components/Carousel.tsx
@@ -13,7 +13,7 @@ const Carousel: React.FC<CarouselProps> = ({ cards }) => {
   return (
     <ScrollView
       horizontal
-      showsHorizontalScrollIndicator={true}
+      showsHorizontalScrollIndicator={false}
       style={styles.carrusel}
     >
       {cards.map((item, index) => (
@@ -30,7 +30,7 @@ const styles = StyleSheet.create({
     flex: 1,
   },
   card: {
-    width: screenWidth - 205, // Ancho de cada card
+    width: screenWidth - 207, // Ancho de cada card
     borderRadius: 10,
     alignItems: 'center',
   },
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index b56771f..75e8656 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -79,7 +79,6 @@ export default function HomeScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    paddingVertical: 15,
     backgroundColor: Colors.bgColor,
     paddingLeft: 5,
   },

From 931015abf029d6714eb8f07fb06a38930c1915cf Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 29 Mar 2025 12:08:40 -0400
Subject: [PATCH 020/291] Card style fix

---
 src/components/Card.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index eb0f1d4..582bddd 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -79,21 +79,15 @@ const ProductCard: React.FC<Product> = ({
 const styles = StyleSheet.create({
   card: {
     margin: 10,
-    backgroundColor: '#fff',
+    backgroundColor: Colors.menuWhite,
     borderWidth: 1,
-    borderColor: '#ccc',
+    borderColor: Colors.gray_100,
     borderRadius: 15,
     padding: 10,
     paddingBottom: 5,
-    //shadowColor: '#000',
-    //shadowOffset: { width: 0, height: 2 },
-    //shadowOpacity: 0.1,
-    //shadowRadius: 4,
-    //elevation: 3,
     marginBottom: 16,
     maxWidth: 140,
     minWidth: 140,
-    //minHeight: 300,
     maxHeight: 300,
   },
   tag: {

From 854bbcbdcb42a62a1a08c57812d267e37665e1f5 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 29 Mar 2025 13:38:23 -0400
Subject: [PATCH 021/291] Updating avatar to latest sdk version

---
 package-lock.json         | 138 ++------------------------------------
 package.json              |   2 +-
 src/components/Avatar.tsx |  17 ++---
 src/services/user.ts      |  23 ++++---
 src/types/api.d.ts        |  12 ++++
 5 files changed, 36 insertions(+), 156 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index d66c7a0..063e7d4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,15 +1,15 @@
 {
   "name": "app",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "app",
-      "version": "0.1.0",
+      "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.1",
+        "@pharmatech/sdk": "^0.3.3",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.1.tgz",
-      "integrity": "sha512-kEfGpYXrnFi75GAZYTkAIKWEwi67bDQBc/rZJ9ZMcgWnJkET9eLCbNWwhQmd0tZOlPOAUOOtuVpI5rSAlCuqkA==",
+      "version": "0.3.3",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.3.tgz",
+      "integrity": "sha512-SFxCUUzk2S0CsN8SHG9tySWIP8MNRciKo9lrNAnwipqPANdQ7tAdCQq47nnqCG+eED/GoVKvJZbTWukO87afkg==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
@@ -4106,132 +4106,6 @@
       "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
       "license": "MIT"
     },
-    "node_modules/@remix-run/node": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.16.0.tgz",
-      "integrity": "sha512-9yYBYCHYO1+bIScGAtOy5/r4BoTS8E5lpQmjWP99UxSCSiKHPEO76V9Z8mmmarTNis/FPN+sUwfmbQWNHLA2vw==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/server-runtime": "2.16.0",
-        "@remix-run/web-fetch": "^4.4.2",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie-signature": "^1.1.0",
-        "source-map-support": "^0.5.21",
-        "stream-slice": "^0.1.2",
-        "undici": "^6.11.1"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/router": {
-      "version": "1.23.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-      "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@remix-run/server-runtime": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.16.0.tgz",
-      "integrity": "sha512-gbuc4slxPi+pT47MrUYprX/wCuDlYL6H3LHZSvimWO1kDCBt8oefHzdHDPjLi4B1xzqXZomswTbuJzpZ7xRRTg==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/router": "1.23.0",
-        "@types/cookie": "^0.6.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie": "^0.6.0",
-        "set-cookie-parser": "^2.4.8",
-        "source-map": "^0.7.3",
-        "turbo-stream": "2.4.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/server-runtime/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@remix-run/web-blob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.1.0.tgz",
-      "integrity": "sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-stream": "^1.1.0",
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-fetch": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.2.tgz",
-      "integrity": "sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0",
-        "@remix-run/web-file": "^3.1.0",
-        "@remix-run/web-form-data": "^3.1.0",
-        "@remix-run/web-stream": "^1.1.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "abort-controller": "^3.0.0",
-        "data-uri-to-buffer": "^3.0.1",
-        "mrmime": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.17 || >=12.3"
-      }
-    },
-    "node_modules/@remix-run/web-file": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.1.0.tgz",
-      "integrity": "sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0"
-      }
-    },
-    "node_modules/@remix-run/web-form-data": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.1.0.tgz",
-      "integrity": "sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==",
-      "license": "MIT",
-      "dependencies": {
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.1.0.tgz",
-      "integrity": "sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==",
-      "license": "MIT",
-      "dependencies": {
-        "web-streams-polyfill": "^3.1.1"
-      }
-    },
     "node_modules/@segment/loosely-validate-event": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz",
diff --git a/package.json b/package.json
index 383f755..2ce0ff0 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.1",
+    "@pharmatech/sdk": "^0.3.3",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index af863cd..b4dd93a 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import { UserService } from '../services/user';
-import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 import PoppinsText from './PoppinsText';
 
 const Avatar: React.FC = () => {
@@ -13,21 +12,13 @@ const Avatar: React.FC = () => {
     const fetchProfile = async () => {
       setLoading(true);
 
-      const userId = await getUserIdFromSecureStore();
-      console.log('User ID:', userId);
-      if (!userId) {
-        console.error('No se pudo obtener el ID del usuario');
-        setLoading(false);
-        return;
-      }
-
-      const response = await UserService.getProfile(userId);
+      const response = await UserService.getProfile();
       console.log('Profile Response:', response);
       if (response.success) {
-        const { firstName, lastName, profilePicture } = response.data!;
-        console.log('Profile Data:', { firstName, lastName, profilePicture });
+        const { firstName, lastName, profile } = response.data!;
+        console.log('Profile Data:', { firstName, lastName, profile });
         setProfile({
-          uri: profilePicture,
+          uri: profile.profilePicture,
           name: `${firstName} ${lastName}`,
         });
       } else {
diff --git a/src/services/user.ts b/src/services/user.ts
index a0abe3a..12f3ca3 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,12 +1,11 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, ProfileResponse } from '../types/api.d';
+import { ServiceResponse, UserList } from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
+import { decodeJWT } from '../helper/jwtHelper';
 
 export const UserService = {
-  getProfile: async (
-    userId: string,
-  ): Promise<ServiceResponse<ProfileResponse>> => {
+  getProfile: async (): Promise<ServiceResponse<UserList>> => {
     try {
       // Obtén el token JWT desde SecureStore
       const token = await SecureStore.getItemAsync('auth_token');
@@ -14,14 +13,18 @@ export const UserService = {
         throw new Error('No se encontró el token de autenticación');
       }
 
-      // Realiza la solicitud manualmente con el encabezado Authorization
-      const response = await api.user['client'].get({
-        url: `/user/${userId}`, // Ajusta la URL según el endpoint real
-        jwt: token, // El token se pasa como parte de la configuración
-      });
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
 
+      // Llama al método `getProfile` del SDK con el userId y el token JWT
+      const response = await api.user.getProfile(userId, token);
       console.log('Profile Data:', response); // Verificar los datos del perfil
-      return { success: true, data: response as ProfileResponse };
+      return { success: true, data: response };
     } catch (error) {
       console.error('Error fetching profile:', error);
       return {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index c51c3ca..398447e 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -64,3 +64,15 @@ export interface ProfileResponse {
   profilePicture: string;
   role: string;
 }
+
+type UserList = BaseModel & {
+  firstName: string;
+  lastName: string;
+  email: string;
+  documentId: string;
+  phoneNumber: string;
+  lastOrderDate: Date;
+  role: string;
+  isValidated: boolean;
+  profile: Profile;
+};

From 6beb4596bd2dbe3bbe071e967442257b68caaa22 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 29 Mar 2025 18:05:36 -0400
Subject: [PATCH 022/291] Add ProductDetailScreen component and update Card for
 navigation; introduce yellow color in theme

---
 package-lock.json                   | 130 +-----------
 src/app/productDetail.tsx           |   2 +
 src/components/Card.tsx             |  96 ++++-----
 src/screens/ProductDetailScreen.tsx | 293 ++++++++++++++++++++++++++++
 src/styles/theme.ts                 |   2 +
 5 files changed, 349 insertions(+), 174 deletions(-)
 create mode 100644 src/app/productDetail.tsx
 create mode 100644 src/screens/ProductDetailScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index d66c7a0..ab8d949 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "app",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "app",
-      "version": "0.1.0",
+      "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
         "@pharmatech/sdk": "^0.3.1",
@@ -4106,132 +4106,6 @@
       "integrity": "sha512-K/BG6eIky/SBpzfHZv/dd+9JBFiS4SWV7FIujVyJRux6e45+73RaUHXLmIR1f7WOMaQ0U1km6qwklRQxpJJY0w==",
       "license": "MIT"
     },
-    "node_modules/@remix-run/node": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/node/-/node-2.16.0.tgz",
-      "integrity": "sha512-9yYBYCHYO1+bIScGAtOy5/r4BoTS8E5lpQmjWP99UxSCSiKHPEO76V9Z8mmmarTNis/FPN+sUwfmbQWNHLA2vw==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/server-runtime": "2.16.0",
-        "@remix-run/web-fetch": "^4.4.2",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie-signature": "^1.1.0",
-        "source-map-support": "^0.5.21",
-        "stream-slice": "^0.1.2",
-        "undici": "^6.11.1"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/router": {
-      "version": "1.23.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/router/-/router-1.23.0.tgz",
-      "integrity": "sha512-O3rHJzAQKamUz1fvE0Qaw0xSFqsA/yafi2iqeE0pvdFtCO1viYx8QL6f3Ln/aCCTLxs68SLf0KPM9eSeM8yBnA==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=14.0.0"
-      }
-    },
-    "node_modules/@remix-run/server-runtime": {
-      "version": "2.16.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/server-runtime/-/server-runtime-2.16.0.tgz",
-      "integrity": "sha512-gbuc4slxPi+pT47MrUYprX/wCuDlYL6H3LHZSvimWO1kDCBt8oefHzdHDPjLi4B1xzqXZomswTbuJzpZ7xRRTg==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/router": "1.23.0",
-        "@types/cookie": "^0.6.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "cookie": "^0.6.0",
-        "set-cookie-parser": "^2.4.8",
-        "source-map": "^0.7.3",
-        "turbo-stream": "2.4.0"
-      },
-      "engines": {
-        "node": ">=18.0.0"
-      },
-      "peerDependencies": {
-        "typescript": "^5.1.0"
-      },
-      "peerDependenciesMeta": {
-        "typescript": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/@remix-run/server-runtime/node_modules/source-map": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.7.4.tgz",
-      "integrity": "sha512-l3BikUxvPOcn5E74dZiq5BGsTb5yEwhaTSzccU6t4sDOH8NWJCstKO5QT2CvtFoK6F0saL7p9xHAqHOlCPJygA==",
-      "license": "BSD-3-Clause",
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/@remix-run/web-blob": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-blob/-/web-blob-3.1.0.tgz",
-      "integrity": "sha512-owGzFLbqPH9PlKb8KvpNJ0NO74HWE2euAn61eEiyCXX/oteoVzTVSN8mpLgDjaxBf2btj5/nUllSUgpyd6IH6g==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-stream": "^1.1.0",
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-fetch": {
-      "version": "4.4.2",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-fetch/-/web-fetch-4.4.2.tgz",
-      "integrity": "sha512-jgKfzA713/4kAW/oZ4bC3MoLWyjModOVDjFPNseVqcJKSafgIscrYL9G50SurEYLswPuoU3HzSbO0jQCMYWHhA==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0",
-        "@remix-run/web-file": "^3.1.0",
-        "@remix-run/web-form-data": "^3.1.0",
-        "@remix-run/web-stream": "^1.1.0",
-        "@web3-storage/multipart-parser": "^1.0.0",
-        "abort-controller": "^3.0.0",
-        "data-uri-to-buffer": "^3.0.1",
-        "mrmime": "^1.0.0"
-      },
-      "engines": {
-        "node": "^10.17 || >=12.3"
-      }
-    },
-    "node_modules/@remix-run/web-file": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-file/-/web-file-3.1.0.tgz",
-      "integrity": "sha512-dW2MNGwoiEYhlspOAXFBasmLeYshyAyhIdrlXBi06Duex5tDr3ut2LFKVj7tyHLmn8nnNwFf1BjNbkQpygC2aQ==",
-      "license": "MIT",
-      "dependencies": {
-        "@remix-run/web-blob": "^3.1.0"
-      }
-    },
-    "node_modules/@remix-run/web-form-data": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-form-data/-/web-form-data-3.1.0.tgz",
-      "integrity": "sha512-NdeohLMdrb+pHxMQ/Geuzdp0eqPbea+Ieo8M8Jx2lGC6TBHsgHzYcBvr0LyPdPVycNRDEpWpiDdCOdCryo3f9A==",
-      "license": "MIT",
-      "dependencies": {
-        "web-encoding": "1.1.5"
-      }
-    },
-    "node_modules/@remix-run/web-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/@remix-run/web-stream/-/web-stream-1.1.0.tgz",
-      "integrity": "sha512-KRJtwrjRV5Bb+pM7zxcTJkhIqWWSy+MYsIxHK+0m5atcznsf15YwUBWHWulZerV2+vvHH1Lp1DD7pw6qKW8SgA==",
-      "license": "MIT",
-      "dependencies": {
-        "web-streams-polyfill": "^3.1.1"
-      }
-    },
     "node_modules/@segment/loosely-validate-event": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/@segment/loosely-validate-event/-/loosely-validate-event-2.0.0.tgz",
diff --git a/src/app/productDetail.tsx b/src/app/productDetail.tsx
new file mode 100644
index 0000000..3ca7330
--- /dev/null
+++ b/src/app/productDetail.tsx
@@ -0,0 +1,2 @@
+import ProductDetailScreen from '../screens/ProductDetailScreen';
+export default ProductDetailScreen;
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 582bddd..b0ab0e7 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -1,11 +1,12 @@
 import React from 'react';
-import { View, StyleSheet, Image } from 'react-native';
+import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
 import CardButton from './CardButton';
 import { truncateString } from '../utils/commons';
 import { useCart } from '../hooks/useCart';
 import { Product } from '../types/Product';
+import { useRouter } from 'expo-router';
 
 const ProductCard: React.FC<Product> = ({
   id,
@@ -18,61 +19,64 @@ const ProductCard: React.FC<Product> = ({
   getQuantity,
 }) => {
   const { getItemQuantity, updateCartQuantity } = useCart();
+  const router = useRouter();
   return (
-    <View style={styles.card}>
-      <View
-        style={{
-          width: '100%',
-          height: 135,
-          marginBottom: 30,
-        }}
-      >
+    <TouchableOpacity onPress={() => router.push('/productDetail')}>
+      <View style={styles.card}>
         <View
           style={{
             width: '100%',
-            flexDirection: 'row-reverse',
+            height: 135,
+            marginBottom: 30,
           }}
         >
-          <PoppinsText style={styles.tag}>{category}</PoppinsText>
-        </View>
-        <View style={styles.imageContainer}>
-          <Image
-            source={{ uri: imageUrl }}
-            width={114}
-            height={118}
-            style={{ borderRadius: 14 }}
-          />
-          <View style={styles.cardButtonContainer}>
-            <CardButton
-              getValue={(quantity) => {
-                if (getQuantity) getQuantity(quantity);
-                updateCartQuantity(id, quantity);
-              }}
-              initialValue={getItemQuantity(id)}
+          <View
+            style={{
+              width: '100%',
+              flexDirection: 'row-reverse',
+            }}
+          >
+            <PoppinsText style={styles.tag}>{category}</PoppinsText>
+          </View>
+          <View style={styles.imageContainer}>
+            <Image
+              source={{ uri: imageUrl }}
+              width={114}
+              height={118}
+              style={{ borderRadius: 14 }}
             />
+            <View style={styles.cardButtonContainer}>
+              <CardButton
+                getValue={(quantity) => {
+                  if (getQuantity) getQuantity(quantity);
+                  updateCartQuantity(id, quantity);
+                }}
+                initialValue={getItemQuantity(id)}
+              />
+            </View>
           </View>
         </View>
+        <View style={styles.description}>
+          <PoppinsText style={styles.name}>{truncateString(name)}</PoppinsText>
+          {discount && (
+            <View style={styles.priceContainer}>
+              <PoppinsText style={styles.originalPrice}>
+                ${originalPrice}
+              </PoppinsText>
+              <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
+            </View>
+          )}
+          <PoppinsText
+            style={[
+              styles.finalPrice,
+              !discount && { color: Colors.semanticInfo },
+            ]}
+          >
+            ${finalPrice}
+          </PoppinsText>
+        </View>
       </View>
-      <View style={styles.description}>
-        <PoppinsText style={styles.name}>{truncateString(name)}</PoppinsText>
-        {discount && (
-          <View style={styles.priceContainer}>
-            <PoppinsText style={styles.originalPrice}>
-              ${originalPrice}
-            </PoppinsText>
-            <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
-          </View>
-        )}
-        <PoppinsText
-          style={[
-            styles.finalPrice,
-            !discount && { color: Colors.semanticInfo },
-          ]}
-        >
-          ${finalPrice}
-        </PoppinsText>
-      </View>
-    </View>
+    </TouchableOpacity>
   );
 };
 
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
new file mode 100644
index 0000000..b30f839
--- /dev/null
+++ b/src/screens/ProductDetailScreen.tsx
@@ -0,0 +1,293 @@
+import React, { useState } from 'react';
+import {
+  View,
+  Text,
+  Image,
+  ScrollView,
+  StyleSheet,
+  TouchableOpacity,
+  SafeAreaView,
+  Dimensions,
+} from 'react-native';
+import TopBar from '../components/TopBar';
+import { StarIcon } from 'react-native-heroicons/solid';
+import { Colors, FontSizes } from '../styles/theme';
+import Dropdown from '../components/Dropdown';
+import CardButton from '../components/CardButton';
+
+type Product = {
+  id: string;
+  name: string;
+  price: number;
+  description: string;
+  rating: number;
+  images: string[];
+  colors: string[];
+  sizes: string[];
+};
+
+const ProductDetailScreen: React.FC = () => {
+  const [userRating, setUserRating] = useState<number>(0); // 0 significa no calificado
+  const [hoverRating, setHoverRating] = useState<number>(0); // Para efecto hover
+
+  // Datos de ejemplo del producto
+  const product: Product = {
+    id: '1',
+    name: 'Zapatillas Running Premium',
+    price: 129.99,
+    description:
+      'Zapatillas de running con tecnología de amortiguación avanzada para mayor comodidad y rendimiento. Ideal para corredores que buscan soporte y ligereza.',
+    rating: 4.8,
+    images: [
+      'https://wallpapers.com/images/featured/imagenes-lindas-para-perfil-estetico-r521rmfa6ucixtw5.jpg',
+      'https://r-charts.com/es/miscelanea/procesamiento-imagenes-magick_files/figure-html/color-fondo-imagen-r.png',
+      'https://img.freepik.com/vector-gratis/cute-cool-boy-dabbing-pose-dibujos-animados-vector-icono-ilustracion-concepto-icono-moda-personas-aislado_138676-5680.jpg',
+    ],
+    colors: ['#000000', '#FF0000', '#1E90FF'],
+    sizes: ['US 6', 'US 7', 'US 8', 'US 9', 'US 10'],
+  };
+
+  const handleRating = (rating: number) => {
+    setUserRating(rating);
+    // Aquí podrías enviar la calificación a tu API
+    console.log('Calificación enviada:', rating);
+  };
+
+  // Componente de estrellas de calificación
+  const RatingStars = () => {
+    return (
+      <View style={styles.ratingStarsContainer}>
+        {[1, 2, 3, 4, 5].map((star) => (
+          <TouchableOpacity
+            key={star}
+            activeOpacity={0.7}
+            onPress={() => handleRating(star)}
+            onPressIn={() => setHoverRating(star)}
+            onPressOut={() => setHoverRating(0)}
+          >
+            <StarIcon
+              size={32}
+              color={
+                star <= (hoverRating || userRating) ? '#FFD700' : '#CCCCCC'
+              }
+              style={styles.starIcon}
+            />
+          </TouchableOpacity>
+        ))}
+      </View>
+    );
+  };
+
+  return (
+    <View style={{ flex: 1 }}>
+      <TopBar />
+      <SafeAreaView style={styles.container}>
+        <ScrollView>
+          {/* Carrusel de imágenes */}
+          <ScrollView
+            horizontal
+            pagingEnabled
+            showsHorizontalScrollIndicator={false}
+          >
+            {product.images.map((image, index) => (
+              <Image
+                key={index}
+                source={{ uri: image }}
+                style={styles.productImage}
+                resizeMode="contain"
+              />
+            ))}
+          </ScrollView>
+
+          {/* Indicadores de imágenes */}
+          <View style={styles.imageIndicators}>
+            {product.images.map((_, index) => (
+              <View key={index} style={styles.imageIndicator} />
+            ))}
+          </View>
+
+          <Text style={styles.productName}>{product.name}</Text>
+
+          <RatingStars />
+          {userRating > 0 && (
+            <Text style={styles.ratingFeedback}>
+              ¡Gracias por tu calificación de {userRating} estrella
+              {userRating !== 1 ? 's' : ''}!
+            </Text>
+          )}
+
+          <Text style={styles.description}>{product.description}</Text>
+
+          {/* Información del producto */}
+          <View style={styles.productInfo}>
+            <View style={styles.priceRatingContainer}>
+              <Text style={styles.price}>Bs {product.price.toFixed(2)}</Text>
+            </View>
+
+            <Text style={styles.sectionTitle}>Selecciona la presentación</Text>
+            <View style={styles.quantitySelector}>
+              <Dropdown
+                options={['A', 'B', 'c']}
+                onSelect={() => console.log('p')}
+              />
+            </View>
+          </View>
+        </ScrollView>
+
+        {/* Botón de agregar al carrito */}
+        <View style={styles.footer}>
+          <CardButton initialValue={0} />
+        </View>
+      </SafeAreaView>
+    </View>
+  );
+};
+
+const { width } = Dimensions.get('window');
+
+const styles = StyleSheet.create({
+  container: {
+    paddingTop: 20,
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  header: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    padding: 16,
+  },
+  backButton: {
+    padding: 8,
+  },
+  favoriteButton: {
+    padding: 8,
+  },
+  productImage: {
+    width: width,
+    height: width,
+  },
+  imageIndicators: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    marginVertical: 8,
+  },
+  imageIndicator: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    backgroundColor: '#CCCCCC',
+    marginHorizontal: 4,
+  },
+  productInfo: {
+    padding: 16,
+  },
+  priceRatingContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  price: {
+    fontSize: 24,
+    fontWeight: 'bold',
+    color: Colors.primary,
+  },
+  ratingContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  ratingText: {
+    marginLeft: 4,
+    fontSize: 16,
+    color: '#666666',
+  },
+  productName: {
+    textAlign: 'center',
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    marginBottom: 20,
+  },
+  description: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+    marginHorizontal: 20,
+    marginBottom: 20,
+    lineHeight: 24,
+  },
+  sectionTitle: {
+    fontSize: FontSizes.s1.size,
+    color: Colors.textLowContrast,
+    marginBottom: 3,
+  },
+  sizeOptions: {
+    flexDirection: 'row',
+    flexWrap: 'wrap',
+    marginBottom: 20,
+  },
+  sizeOption: {
+    width: 60,
+    height: 40,
+    borderRadius: 8,
+    borderWidth: 1,
+    borderColor: '#EEEEEE',
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginRight: 12,
+    marginBottom: 12,
+    backgroundColor: '#FFFFFF',
+  },
+  selectedSizeOption: {
+    borderColor: '#000000',
+    backgroundColor: '#000000',
+  },
+  sizeText: {
+    color: '#333333',
+  },
+  selectedSizeText: {
+    color: '#FFFFFF',
+  },
+  quantitySelector: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 30,
+  },
+  quantityButton: {
+    width: 40,
+    height: 40,
+    borderRadius: 20,
+    borderWidth: 1,
+    borderColor: '#EEEEEE',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  quantityText: {
+    fontSize: 18,
+    marginHorizontal: 20,
+  },
+  footer: {
+    flexDirection: 'row-reverse',
+    padding: 16,
+    backgroundColor: '',
+  },
+  addToCartText: {
+    color: '#FFFFFF',
+    fontSize: 18,
+    fontWeight: '600',
+  },
+  ratingStarsContainer: {
+    flexDirection: 'row',
+    marginBottom: 20,
+    justifyContent: 'center',
+  },
+  starIcon: {
+    marginHorizontal: 4,
+  },
+  ratingFeedback: {
+    textAlign: 'center',
+    color: '#4CAF50',
+    marginBottom: 20,
+    fontStyle: 'italic',
+  },
+});
+
+export default ProductDetailScreen;
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 06873be..458e3ff 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -31,6 +31,8 @@ export const Colors = {
   toggleOn: '#1C2143',
   toggleOff: '#D7D5D3',
 
+  yellow: '#FFBA2E0',
+
   gray_100: '#E7E7E6',
   gray_500: '#6E6D6C',
 };

From f75968c843926d4b3c137ccb44c896df45b79882 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 29 Mar 2025 18:36:00 -0400
Subject: [PATCH 023/291] Enhance ProductDetailScreen with image carousel
 functionality and dropdown border color; refactor styles for consistency

---
 src/components/Dropdown.tsx         |   9 ++-
 src/components/ImageCarousel.tsx    |   0
 src/screens/ProductDetailScreen.tsx | 111 ++++++++++++++++------------
 3 files changed, 68 insertions(+), 52 deletions(-)
 create mode 100644 src/components/ImageCarousel.tsx

diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx
index 5e554fc..3909966 100644
--- a/src/components/Dropdown.tsx
+++ b/src/components/Dropdown.tsx
@@ -16,6 +16,7 @@ interface DropdownProps {
   placeholder?: string;
   options: string[];
   border?: borderType;
+  borderColor?: string;
   onSelect: (option: string) => void;
 }
 
@@ -24,6 +25,7 @@ const Dropdown: React.FC<DropdownProps> = ({
   placeholder,
   options,
   border = 'default',
+  borderColor = Colors.primary,
   onSelect,
 }) => {
   const [isOpen, setIsOpen] = useState(false);
@@ -51,7 +53,10 @@ const Dropdown: React.FC<DropdownProps> = ({
       {label && <PoppinsText style={styles.label}>{label}</PoppinsText>}
       <TouchableOpacity
         onPress={() => setIsOpen(!isOpen)}
-        style={[{ borderWidth: getBorderWidth() }, styles.Selectbtn]}
+        style={[
+          { borderWidth: getBorderWidth(), borderColor: borderColor },
+          styles.Selectbtn,
+        ]}
       >
         <PoppinsText style={[styles.selectedText]}>
           {selectedOption || placeholder}
@@ -93,7 +98,6 @@ const Dropdown: React.FC<DropdownProps> = ({
 const styles = StyleSheet.create({
   container: {
     width: '100%',
-    paddingHorizontal: 24,
     paddingVertical: 12,
   },
   label: {
@@ -103,7 +107,6 @@ const styles = StyleSheet.create({
   Selectbtn: {
     flexDirection: 'row',
     alignItems: 'center',
-    borderColor: Colors.primary,
     borderRadius: 10,
     padding: 10,
     paddingHorizontal: 15,
diff --git a/src/components/ImageCarousel.tsx b/src/components/ImageCarousel.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index b30f839..8393e92 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useRef } from 'react';
 import {
   View,
   Text,
@@ -8,12 +8,15 @@ import {
   TouchableOpacity,
   SafeAreaView,
   Dimensions,
+  NativeSyntheticEvent,
+  NativeScrollEvent,
 } from 'react-native';
 import TopBar from '../components/TopBar';
 import { StarIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
 import CardButton from '../components/CardButton';
+import PoppinsText from '../components/PoppinsText';
 
 type Product = {
   id: string;
@@ -29,11 +32,29 @@ type Product = {
 const ProductDetailScreen: React.FC = () => {
   const [userRating, setUserRating] = useState<number>(0); // 0 significa no calificado
   const [hoverRating, setHoverRating] = useState<number>(0); // Para efecto hover
+  const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
+  const imagesScrollRef = useRef<ScrollView>(null);
+
+  const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+    const contentOffsetX = event.nativeEvent.contentOffset.x;
+    const newIndex = Math.round(contentOffsetX / width);
+    setCurrentImageIndex(newIndex);
+  };
+
+  const scrollToImage = (index: number) => {
+    setCurrentImageIndex(index);
+    if (imagesScrollRef.current) {
+      imagesScrollRef.current.scrollTo({
+        x: index * width,
+        animated: true,
+      });
+    }
+  };
 
   // Datos de ejemplo del producto
   const product: Product = {
     id: '1',
-    name: 'Zapatillas Running Premium',
+    name: 'Acetaminofen 650mg Genven Caja x 10 tabletas',
     price: 129.99,
     description:
       'Zapatillas de running con tecnología de amortiguación avanzada para mayor comodidad y rendimiento. Ideal para corredores que buscan soporte y ligereza.',
@@ -85,9 +106,11 @@ const ProductDetailScreen: React.FC = () => {
         <ScrollView>
           {/* Carrusel de imágenes */}
           <ScrollView
+            ref={imagesScrollRef}
             horizontal
             pagingEnabled
             showsHorizontalScrollIndicator={false}
+            onMomentumScrollEnd={handleScroll}
           >
             {product.images.map((image, index) => (
               <Image
@@ -102,11 +125,21 @@ const ProductDetailScreen: React.FC = () => {
           {/* Indicadores de imágenes */}
           <View style={styles.imageIndicators}>
             {product.images.map((_, index) => (
-              <View key={index} style={styles.imageIndicator} />
+              <TouchableOpacity
+                key={index}
+                onPress={() => scrollToImage(index)}
+              >
+                <View
+                  style={[
+                    styles.imageIndicator,
+                    index === currentImageIndex && styles.activeImageIndicator,
+                  ]}
+                />
+              </TouchableOpacity>
             ))}
           </View>
 
-          <Text style={styles.productName}>{product.name}</Text>
+          <PoppinsText style={styles.productName}>{product.name}</PoppinsText>
 
           <RatingStars />
           {userRating > 0 && (
@@ -116,21 +149,29 @@ const ProductDetailScreen: React.FC = () => {
             </Text>
           )}
 
-          <Text style={styles.description}>{product.description}</Text>
+          <PoppinsText style={styles.description}>
+            {product.description}
+          </PoppinsText>
 
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
               <Text style={styles.price}>Bs {product.price.toFixed(2)}</Text>
             </View>
-
             <Text style={styles.sectionTitle}>Selecciona la presentación</Text>
             <View style={styles.quantitySelector}>
               <Dropdown
                 options={['A', 'B', 'c']}
+                borderColor={Colors.gray_100}
                 onSelect={() => console.log('p')}
               />
             </View>
+            <Text style={styles.sectionTitle}>Disponibilidad en sucursal</Text>
+            <View style={styles.quantitySelector}>
+              <View style={styles.mapContainer}>
+                <PoppinsText>Mapa</PoppinsText>
+              </View>
+            </View>
           </View>
         </ScrollView>
 
@@ -164,7 +205,7 @@ const styles = StyleSheet.create({
   },
   productImage: {
     width: width,
-    height: width,
+    height: 290,
   },
   imageIndicators: {
     flexDirection: 'row',
@@ -178,8 +219,13 @@ const styles = StyleSheet.create({
     backgroundColor: '#CCCCCC',
     marginHorizontal: 4,
   },
+  activeImageIndicator: {
+    backgroundColor: Colors.gray_500,
+    width: 17,
+  },
   productInfo: {
     padding: 16,
+    paddingVertical: 0,
   },
   priceRatingContainer: {
     flexDirection: 'row',
@@ -205,7 +251,7 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
-    marginBottom: 20,
+    marginVertical: 15,
   },
   description: {
     fontSize: FontSizes.b3.size,
@@ -219,51 +265,10 @@ const styles = StyleSheet.create({
     color: Colors.textLowContrast,
     marginBottom: 3,
   },
-  sizeOptions: {
-    flexDirection: 'row',
-    flexWrap: 'wrap',
-    marginBottom: 20,
-  },
-  sizeOption: {
-    width: 60,
-    height: 40,
-    borderRadius: 8,
-    borderWidth: 1,
-    borderColor: '#EEEEEE',
-    justifyContent: 'center',
-    alignItems: 'center',
-    marginRight: 12,
-    marginBottom: 12,
-    backgroundColor: '#FFFFFF',
-  },
-  selectedSizeOption: {
-    borderColor: '#000000',
-    backgroundColor: '#000000',
-  },
-  sizeText: {
-    color: '#333333',
-  },
-  selectedSizeText: {
-    color: '#FFFFFF',
-  },
   quantitySelector: {
     flexDirection: 'row',
-    alignItems: 'center',
     marginBottom: 30,
   },
-  quantityButton: {
-    width: 40,
-    height: 40,
-    borderRadius: 20,
-    borderWidth: 1,
-    borderColor: '#EEEEEE',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  quantityText: {
-    fontSize: 18,
-    marginHorizontal: 20,
-  },
   footer: {
     flexDirection: 'row-reverse',
     padding: 16,
@@ -288,6 +293,14 @@ const styles = StyleSheet.create({
     marginBottom: 20,
     fontStyle: 'italic',
   },
+  mapContainer: {
+    backgroundColor: Colors.secondaryGray,
+    minHeight: width,
+    maxHeight: width,
+    width: width - 35,
+    borderRadius: 15,
+    marginVertical: 8,
+  },
 });
 
 export default ProductDetailScreen;

From e85f614f299c532940f7257931db8a456fdb6bdc Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 29 Mar 2025 18:42:09 -0400
Subject: [PATCH 024/291] Add dropdown for state selection and adjust button
 container styling in ProductDetailScreen

---
 src/screens/ProductDetailScreen.tsx | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 8393e92..37a8cc4 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -172,11 +172,20 @@ const ProductDetailScreen: React.FC = () => {
                 <PoppinsText>Mapa</PoppinsText>
               </View>
             </View>
+
+            <Text style={styles.sectionTitle}>Selecciona el estado</Text>
+            <View style={styles.quantitySelector}>
+              <Dropdown
+                options={['Lara', 'Anzoategui', 'Caracas']}
+                borderColor={Colors.gray_100}
+                onSelect={() => console.log('p')}
+              />
+            </View>
           </View>
         </ScrollView>
 
         {/* Botón de agregar al carrito */}
-        <View style={styles.footer}>
+        <View style={styles.cardButtonContainer}>
           <CardButton initialValue={0} />
         </View>
       </SafeAreaView>
@@ -301,6 +310,14 @@ const styles = StyleSheet.create({
     borderRadius: 15,
     marginVertical: 8,
   },
+  cardButtonContainer: {
+    position: 'relative',
+    top: -40,
+    left: 120,
+    maxWidth: '65%',
+    alignItems: 'flex-end',
+    zIndex: 999,
+  },
 });
 
 export default ProductDetailScreen;

From 4a6185cf49083ac60578c30d64f881323efa9ed3 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 29 Mar 2025 19:08:03 -0400
Subject: [PATCH 025/291] Avatar fixes for user registration

---
 src/components/Avatar.tsx            | 28 ++++++++++++++++++++++++----
 src/helper/jwtHelper.ts              |  7 ++++++-
 src/screens/tab/CategoriesScreen.tsx |  9 +++++++--
 src/services/auth.ts                 | 10 ++++++++++
 4 files changed, 47 insertions(+), 7 deletions(-)

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index b4dd93a..1b906bd 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -3,6 +3,7 @@ import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
+import * as SecureStore from 'expo-secure-store';
 
 const Avatar: React.FC = () => {
   const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
@@ -12,13 +13,32 @@ const Avatar: React.FC = () => {
     const fetchProfile = async () => {
       setLoading(true);
 
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        console.warn(
+          'No se encontró el token de autenticación. Usando datos locales.',
+        );
+
+        // Data from secureStore
+        const userData = await SecureStore.getItemAsync('user_data');
+        if (userData) {
+          const { firstName, lastName } = JSON.parse(userData);
+          setProfile({
+            name: `${firstName} ${lastName}`,
+          });
+        } else {
+          console.error('No se encontraron datos del usuario en SecureStore.');
+        }
+
+        setLoading(false);
+        return;
+      }
+
       const response = await UserService.getProfile();
-      console.log('Profile Response:', response);
       if (response.success) {
-        const { firstName, lastName, profile } = response.data!;
-        console.log('Profile Data:', { firstName, lastName, profile });
+        const { firstName, lastName, profilePicture } = response.data!;
         setProfile({
-          uri: profile.profilePicture,
+          uri: profilePicture,
           name: `${firstName} ${lastName}`,
         });
       } else {
diff --git a/src/helper/jwtHelper.ts b/src/helper/jwtHelper.ts
index fa5ce0e..c2ca4af 100644
--- a/src/helper/jwtHelper.ts
+++ b/src/helper/jwtHelper.ts
@@ -1,6 +1,11 @@
 import * as SecureStore from 'expo-secure-store';
 
 export const decodeJWT = (token: string): { userId: string } | null => {
+  if (!token) {
+    console.error('Token vacío o nulo');
+    return null;
+  }
+
   try {
     const payload = token.split('.')[1];
     const decodedPayload = JSON.parse(atob(payload));
@@ -15,7 +20,7 @@ export const decodeJWT = (token: string): { userId: string } | null => {
 export const getUserIdFromSecureStore = async (): Promise<string | null> => {
   try {
     const token = await SecureStore.getItemAsync('auth_token');
-    console.log('Retrieved Token:', token); // Chenking if the token is retrieved correctly
+    console.log('Retrieved Token:', token); // Checking if the token is retrieved correctly
     if (!token) return null;
 
     const decoded = decodeJWT(token);
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index a607473..7dc672e 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -6,6 +6,7 @@ import { useRouter } from 'expo-router';
 import { Colors } from '../../styles/theme';
 import * as SecureStore from 'expo-secure-store';
 import Popup from '../../components/Popup';
+import * as Updates from 'expo-updates';
 
 export default function CategoriesScreen() {
   const router = useRouter();
@@ -13,9 +14,13 @@ export default function CategoriesScreen() {
 
   const handleLogout = async () => {
     try {
+      // Eliminating user data from SecureStore
+      await SecureStore.deleteItemAsync('user_data');
       await SecureStore.deleteItemAsync('auth_token');
-      setShowPopup(false);
-      router.replace('/login');
+      await SecureStore.deleteItemAsync('reset_token');
+
+      // Forcing app reload
+      await Updates.reloadAsync();
     } catch (error) {
       console.error('Error al cerrar sesión:', error);
     }
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 354c81c..59a7a4e 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -67,6 +67,16 @@ export const AuthService = {
         gender: mappedGender,
       });
 
+      // Saving user data in SecureStore
+      await SecureStore.setItemAsync(
+        'user_data',
+        JSON.stringify({
+          firstName: response.firstName,
+          lastName: response.lastName,
+          email: response.email,
+        }),
+      );
+
       return { success: true, data: response };
     } catch (error) {
       return {

From 4e75837cfaabf213b7017a5a0805d0351cbdfe7d Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 29 Mar 2025 19:11:07 -0400
Subject: [PATCH 026/291] Adding user_data elimination for login just in case

---
 src/services/auth.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/services/auth.ts b/src/services/auth.ts
index 59a7a4e..e23f64e 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -18,6 +18,9 @@ export const AuthService = {
       });
 
       await SecureStore.setItemAsync('auth_token', accessToken);
+
+      await SecureStore.deleteItemAsync('user_data');
+
       return { success: true, data: undefined };
     } catch (error) {
       return {

From 5f383726e3d3ae6195b1b9f55f5ac30439702029 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 29 Mar 2025 19:49:52 -0400
Subject: [PATCH 027/291] Updating to sdk 0.3.4

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 063e7d4..cfa4096 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.3",
+        "@pharmatech/sdk": "^0.3.4",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.3.tgz",
-      "integrity": "sha512-SFxCUUzk2S0CsN8SHG9tySWIP8MNRciKo9lrNAnwipqPANdQ7tAdCQq47nnqCG+eED/GoVKvJZbTWukO87afkg==",
+      "version": "0.3.4",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.4.tgz",
+      "integrity": "sha512-NP+I322ez13uc6mdcNKiX4mMOCTjj89FIFKDZkOUHVYup0zHLWMbFawEr7Tnkc3iTwcbBFxhR4uEMqLKurH4dA==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 2ce0ff0..99322b0 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.3",
+    "@pharmatech/sdk": "^0.3.4",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",

From 468dcd4184e028bdb5eb745320132edc45fe5186 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 29 Mar 2025 20:51:48 -0400
Subject: [PATCH 028/291] Add product detail screen enhancements and API
 integration; update styles and dropdowns

---
 src/app/_layout.tsx                 |  1 +
 src/components/CardButton.tsx       |  9 ++--
 src/components/Dropdown.tsx         |  4 +-
 src/screens/ProductDetailScreen.tsx | 83 +++++++++++++++++------------
 src/services/products.ts            | 14 +++++
 5 files changed, 71 insertions(+), 40 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index bce89e3..9ee07b6 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -57,6 +57,7 @@ export default function RootLayout() {
         <Stack.Screen name="index" redirect={true} />
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+        <Stack.Screen name="productDetail" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index f311e59..db632b2 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -7,12 +7,14 @@ import { Colors, FontSizes } from '../styles/theme';
 interface CardButtonProps {
   getValue?: (count: number) => void;
   initialValue: number;
+  size?: number;
   syncQuantity?: (count: number) => void;
 }
 
 const CardButton: React.FC<CardButtonProps> = ({
   getValue,
   initialValue = 0,
+  size = 4,
   syncQuantity,
 }) => {
   const [count, setCount] = useState(initialValue);
@@ -53,7 +55,7 @@ const CardButton: React.FC<CardButtonProps> = ({
     <View style={styles.container}>
       {!showCounter ? (
         <TouchableOpacity
-          style={styles.mainButton}
+          style={[styles.mainButton, { padding: size }]}
           onPress={showCounterIncrement}
         >
           <PoppinsText style={styles.buttonText}>
@@ -61,7 +63,7 @@ const CardButton: React.FC<CardButtonProps> = ({
           </PoppinsText>
         </TouchableOpacity>
       ) : (
-        <View style={styles.counterContainer}>
+        <View style={[styles.counterContainer, { padding: size }]}>
           <TouchableOpacity
             style={[styles.counterButton]}
             onPress={decrementCount}
@@ -95,8 +97,6 @@ const styles = StyleSheet.create({
   },
   mainButton: {
     backgroundColor: Colors.primary,
-    paddingVertical: 4,
-    paddingHorizontal: 4,
     borderRadius: 50,
     elevation: 3,
   },
@@ -106,7 +106,6 @@ const styles = StyleSheet.create({
     gap: 15,
     backgroundColor: Colors.primary,
     borderRadius: 50,
-    padding: 4,
   },
   counterButton: {
     width: 20,
diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx
index 3909966..a262a92 100644
--- a/src/components/Dropdown.tsx
+++ b/src/components/Dropdown.tsx
@@ -111,6 +111,7 @@ const styles = StyleSheet.create({
     padding: 10,
     paddingHorizontal: 15,
     fontSize: FontSizes.label.size,
+    backgroundColor: Colors.textWhite,
   },
   selectedText: {
     fontSize: 16,
@@ -119,9 +120,10 @@ const styles = StyleSheet.create({
   },
   optionsContainer: {
     marginTop: 15,
-    borderColor: '#ccc',
+    borderColor: Colors.gray_100,
     borderRadius: 5,
     borderWidth: 1,
+    backgroundColor: Colors.textWhite,
   },
   option: {
     padding: 10,
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 37a8cc4..e750fb0 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useRef } from 'react';
+import React, { useState, useRef, useEffect } from 'react';
 import {
   View,
   Text,
@@ -17,6 +17,7 @@ import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
 import CardButton from '../components/CardButton';
 import PoppinsText from '../components/PoppinsText';
+import { ProductService } from '../services/products';
 
 type Product = {
   id: string;
@@ -25,8 +26,6 @@ type Product = {
   description: string;
   rating: number;
   images: string[];
-  colors: string[];
-  sizes: string[];
 };
 
 const ProductDetailScreen: React.FC = () => {
@@ -57,17 +56,28 @@ const ProductDetailScreen: React.FC = () => {
     name: 'Acetaminofen 650mg Genven Caja x 10 tabletas',
     price: 129.99,
     description:
-      'Zapatillas de running con tecnología de amortiguación avanzada para mayor comodidad y rendimiento. Ideal para corredores que buscan soporte y ligereza.',
+      'Zapatillas de running con tecnología de amortiguación avanzada.',
     rating: 4.8,
     images: [
       'https://wallpapers.com/images/featured/imagenes-lindas-para-perfil-estetico-r521rmfa6ucixtw5.jpg',
       'https://r-charts.com/es/miscelanea/procesamiento-imagenes-magick_files/figure-html/color-fondo-imagen-r.png',
       'https://img.freepik.com/vector-gratis/cute-cool-boy-dabbing-pose-dibujos-animados-vector-icono-ilustracion-concepto-icono-moda-personas-aislado_138676-5680.jpg',
     ],
-    colors: ['#000000', '#FF0000', '#1E90FF'],
-    sizes: ['US 6', 'US 7', 'US 8', 'US 9', 'US 10'],
   };
 
+  useEffect(() => {
+    const obtainProducts = async () => {
+      const productsData = await ProductService.getProduct(1);
+
+      if (productsData.success) {
+        console.log(productsData);
+      } else {
+        console.log(productsData.error);
+      }
+    };
+    obtainProducts();
+  }, []);
+
   const handleRating = (rating: number) => {
     setUserRating(rating);
     // Aquí podrías enviar la calificación a tu API
@@ -156,26 +166,46 @@ const ProductDetailScreen: React.FC = () => {
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
-              <Text style={styles.price}>Bs {product.price.toFixed(2)}</Text>
+              <PoppinsText style={styles.price}>
+                Bs {product.price.toFixed(2)}
+              </PoppinsText>
             </View>
-            <Text style={styles.sectionTitle}>Selecciona la presentación</Text>
+            <PoppinsText style={styles.sectionTitle}>
+              Selecciona la presentación
+            </PoppinsText>
             <View style={styles.quantitySelector}>
               <Dropdown
+                placeholder="Presentación..."
                 options={['A', 'B', 'c']}
                 borderColor={Colors.gray_100}
                 onSelect={() => console.log('p')}
               />
             </View>
-            <Text style={styles.sectionTitle}>Disponibilidad en sucursal</Text>
+            <PoppinsText
+              style={[
+                styles.sectionTitle,
+                { fontSize: FontSizes.s1.size, paddingTop: 15 },
+              ]}
+            >
+              Disponibilidad en sucursales
+            </PoppinsText>
             <View style={styles.quantitySelector}>
               <View style={styles.mapContainer}>
-                <PoppinsText>Mapa</PoppinsText>
+                <Image
+                  source={{
+                    uri: 'https://s3-alpha-sig.figma.com/img/e1d4/243c/e04ae0848573e5aec930a59844b09c9d?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=FXKYpecuImVVY6u2fXMUb9gNHckqHMuudCo5P2d8nKpcX4UOIDviLX9axkku~lqIwrFxFrrwi-K1SfHW9Ptvp1YCeRMuw12APbec9X45pxjdXxZZ7B--elUAPERCWzJXmX3WSxW~YIYfqMtK6Ld~3w4JXKif0ajl9zkzojgF-ZxGsddzhXL3Th~tgIrzCy3Nmv5tNFClXiweA3weh~tnqR3xKhsqr0YmPWihV24a40aDrQw-Qk1ilxuDYwZJ3sChx8TPXPIeM3K0dsjGkENGbHmqe5qHt4UWce1PGpPs4TnaCl~DmwdgIYRZP3TywbDsNZbXR9OQdFTB2EToVFmFvQ__',
+                  }}
+                  style={{ width: 300, height: 300, borderRadius: 5 }}
+                  resizeMode="contain"
+                />
               </View>
             </View>
-
-            <Text style={styles.sectionTitle}>Selecciona el estado</Text>
+            <PoppinsText style={styles.sectionTitle}>
+              Selecciona el estado
+            </PoppinsText>
             <View style={styles.quantitySelector}>
               <Dropdown
+                placeholder="Estado..."
                 options={['Lara', 'Anzoategui', 'Caracas']}
                 borderColor={Colors.gray_100}
                 onSelect={() => console.log('p')}
@@ -184,9 +214,8 @@ const ProductDetailScreen: React.FC = () => {
           </View>
         </ScrollView>
 
-        {/* Botón de agregar al carrito */}
         <View style={styles.cardButtonContainer}>
-          <CardButton initialValue={0} />
+          <CardButton initialValue={0} size={10} />
         </View>
       </SafeAreaView>
     </View>
@@ -197,24 +226,13 @@ const { width } = Dimensions.get('window');
 
 const styles = StyleSheet.create({
   container: {
-    paddingTop: 20,
+    paddingTop: 15,
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
-  header: {
-    flexDirection: 'row',
-    justifyContent: 'space-between',
-    padding: 16,
-  },
-  backButton: {
-    padding: 8,
-  },
-  favoriteButton: {
-    padding: 8,
-  },
   productImage: {
     width: width,
-    height: 290,
+    height: 250,
   },
   imageIndicators: {
     flexDirection: 'row',
@@ -270,13 +288,13 @@ const styles = StyleSheet.create({
     lineHeight: 24,
   },
   sectionTitle: {
-    fontSize: FontSizes.s1.size,
+    fontSize: FontSizes.s2.size,
     color: Colors.textLowContrast,
     marginBottom: 3,
   },
   quantitySelector: {
     flexDirection: 'row',
-    marginBottom: 30,
+    marginBottom: 15,
   },
   footer: {
     flexDirection: 'row-reverse',
@@ -303,12 +321,9 @@ const styles = StyleSheet.create({
     fontStyle: 'italic',
   },
   mapContainer: {
-    backgroundColor: Colors.secondaryGray,
-    minHeight: width,
-    maxHeight: width,
-    width: width - 35,
-    borderRadius: 15,
     marginVertical: 8,
+    flex: 1,
+    alignItems: 'center',
   },
   cardButtonContainer: {
     position: 'relative',
diff --git a/src/services/products.ts b/src/services/products.ts
index 2f7bf36..fc66d36 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -25,4 +25,18 @@ export const ProductService = {
       };
     }
   },
+
+  getProduct: async (id: number): Promise<ProductPresentation> => {
+    try {
+      console.log(id);
+      const product = await api.country.findAll({ page: 1, limit: 10 });
+
+      return { success: true, data: product };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From a5adb6801948df904f1a4ee0b4d59c6ec5a43319 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 29 Mar 2025 22:38:47 -0400
Subject: [PATCH 029/291] Update @pharmatech/sdk to version 0.3.5; enhance
 ProductDetailScreen with availability information and related products
 section

---
 package-lock.json                   |  9 ++--
 package.json                        |  2 +-
 src/screens/ProductDetailScreen.tsx | 66 ++++++++++++++++++++++++++++-
 3 files changed, 70 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 063e7d4..d96d23d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.3",
+        "@pharmatech/sdk": "^0.3.4",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,10 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.3",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.3.tgz",
-      "integrity": "sha512-SFxCUUzk2S0CsN8SHG9tySWIP8MNRciKo9lrNAnwipqPANdQ7tAdCQq47nnqCG+eED/GoVKvJZbTWukO87afkg==",
-      "license": "MIT",
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.5.tgz",
+      "integrity": "sha512-GqomIP6TvEa7r0hQXBJg/OOLYRo44Cfeq7EDh2vyJ9FYCg4iHV+C2+JH4BN0R1d65eUuBtlhxuU+r78juUjO6g==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 2ce0ff0..99322b0 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.3",
+    "@pharmatech/sdk": "^0.3.4",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index e750fb0..59266c3 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -12,12 +12,14 @@ import {
   NativeScrollEvent,
 } from 'react-native';
 import TopBar from '../components/TopBar';
-import { StarIcon } from 'react-native-heroicons/solid';
+import { CheckCircleIcon, StarIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
 import CardButton from '../components/CardButton';
 import PoppinsText from '../components/PoppinsText';
 import { ProductService } from '../services/products';
+import { TruckIcon } from 'react-native-heroicons/outline';
+//import Carousel from '../components/Carousel';
 
 type Product = {
   id: string;
@@ -211,6 +213,55 @@ const ProductDetailScreen: React.FC = () => {
                 onSelect={() => console.log('p')}
               />
             </View>
+            <View style={styles.availableContainer}>
+              <View style={styles.availableCard}>
+                <View style={{ padding: 10, paddingHorizontal: 16 }}>
+                  <PoppinsText style={styles.sectionTitle}>
+                    Pharmatech Sambil Barquisimeto
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.b3.size,
+                      color: Colors.textLowContrast,
+                    }}
+                  >
+                    Av. Venezuela con Av. Bracamonte
+                  </PoppinsText>
+                </View>
+                <View
+                  style={{
+                    width: '100%',
+                    alignItems: 'flex-end',
+                    paddingHorizontal: 20,
+                  }}
+                >
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.c1.size,
+                      color: Colors.textLowContrast,
+                    }}
+                  >
+                    150 unidades{' '}
+                    <CheckCircleIcon size={15} color={Colors.semanticSuccess} />
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.c3.size,
+                      color: Colors.gray_500,
+                    }}
+                  >
+                    <TruckIcon size={15} color={Colors.gray_500} /> Envio en
+                    menos de 3h
+                  </PoppinsText>
+                </View>
+              </View>
+            </View>
+            <PoppinsText style={styles.sectionTitle}>
+              Productos relacionados
+            </PoppinsText>
+            <View style={styles.quantitySelector}>
+              {/* <Carousel cards={} /> */}
+            </View>
           </View>
         </ScrollView>
 
@@ -325,6 +376,19 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'center',
   },
+  availableContainer: {
+    marginBottom: 8,
+    backgroundColor: Colors.textWhite,
+    borderRadius: 15,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+  },
+  availableCard: {
+    marginBottom: 10,
+    justifyContent: 'space-between',
+    borderBottomWidth: 1,
+    borderColor: Colors.gray_100,
+  },
   cardButtonContainer: {
     position: 'relative',
     top: -40,

From e68cbb941c23f1c3922bc9f8b6dbe93c2bdd415d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 29 Mar 2025 23:41:17 -0400
Subject: [PATCH 030/291] =?UTF-8?q?feat(APP-M-7):=20agregar=20verificaci?=
 =?UTF-8?q?=C3=B3n=20de=20correo=20electr=C3=B3nico?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/screens/tab/CategoriesScreen.tsx       |  13 +
 src/screens/tab/EmailVerificationModal.tsx | 308 +++++++++++++++++++++
 src/services/auth.ts                       |  48 ++++
 3 files changed, 369 insertions(+)
 create mode 100644 src/screens/tab/EmailVerificationModal.tsx

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index a607473..e96baf8 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -3,11 +3,13 @@ import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import Button from '../../components/Button';
 import { useRouter } from 'expo-router';
+import EmailVerificationModal from './EmailVerificationModal';
 import { Colors } from '../../styles/theme';
 import * as SecureStore from 'expo-secure-store';
 import Popup from '../../components/Popup';
 
 export default function CategoriesScreen() {
+  const [isModalVisible, setIsModalVisible] = useState(false);
   const router = useRouter();
   const [showPopup, setShowPopup] = useState(false);
 
@@ -54,6 +56,17 @@ export default function CategoriesScreen() {
         mode="filled"
         size="large"
       />
+      <Button
+        title="Verificar correo"
+        onPress={() => setIsModalVisible(true)}
+        variant="primary"
+        mode="filled"
+        size="large"
+      />
+      <EmailVerificationModal
+        visible={isModalVisible}
+        onClose={() => setIsModalVisible(false)}
+      />
     </View>
   );
 }
diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
new file mode 100644
index 0000000..4fb506e
--- /dev/null
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -0,0 +1,308 @@
+import React, { useState, useRef, useCallback, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  TextInput,
+  Animated,
+  TouchableOpacity,
+  Text,
+  Modal,
+} from 'react-native';
+import Button from '../../components/Button';
+import PoppinsText from '../../components/PoppinsText';
+import Alert from '../../components/Alerts';
+import { Colors, FontSizes } from '../../styles/theme';
+import { AuthService } from '../../services/auth';
+import { XMarkIcon } from 'react-native-heroicons/outline';
+
+export default function EmailVerificationModal({
+  visible,
+  onClose,
+}: {
+  visible: boolean;
+  onClose: () => void;
+}) {
+  const [resending, setResending] = useState(false);
+  const [countdown, setCountdown] = useState(0); // Countdown state
+  const fadeAnim = useRef(new Animated.Value(1)).current;
+  const [loading, setLoading] = useState(false);
+  const [code, setCode] = useState(['', '', '', '', '', '']);
+  const codeRefs = useRef<Array<TextInput>>([]);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+
+  useEffect(() => {
+    let timer: NodeJS.Timeout;
+    if (resending && countdown > 0) {
+      timer = setInterval(() => {
+        setCountdown((prev) => prev - 1);
+      }, 1000);
+    } else if (countdown === 0) {
+      setResending(false);
+    }
+    return () => clearInterval(timer);
+  }, [resending, countdown]);
+
+  const handleVerifyCode = async () => {
+    const enteredCode = code.join('');
+    if (enteredCode.length !== 6) {
+      setErrorMessage('El código debe tener 6 dígitos');
+      setShowErrorAlert(true);
+      return;
+    }
+
+    setLoading(true);
+    try {
+      await AuthService.validateOtp(enteredCode);
+      setShowSuccessAlert(true);
+      setCode(['', '', '', '', '', '']);
+      setTimeout(() => onClose(), 2000);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleResendCode = async () => {
+    if (resending) return;
+
+    setResending(true);
+    setCountdown(60);
+    try {
+      const response = await AuthService.resendOtp();
+      if (response.success) {
+        setShowSuccessAlert(true);
+        setErrorMessage('Código reenviado exitosamente.');
+      } else {
+        setErrorMessage(response.error || 'Error al reenviar el código.');
+        setShowErrorAlert(true);
+      }
+    } finally {
+      setResending(false);
+    }
+  };
+
+  const renderCodeInputs = useCallback(() => {
+    return (
+      <View style={styles.codeContainer}>
+        {code.map((digit, index) => (
+          <TextInput
+            key={index}
+            ref={(ref) => (codeRefs.current[index] = ref as TextInput)}
+            placeholder="•"
+            placeholderTextColor={Colors.textLowContrast}
+            style={styles.codeInput}
+            caretHidden={true}
+            keyboardType="number-pad"
+            maxLength={1}
+            value={digit}
+            onChangeText={(text) => {
+              const newCode = [...code];
+              const cleanedText = text.replace(/[^0-9]/g, '');
+              newCode[index] = cleanedText;
+              setCode(newCode);
+              if (cleanedText && index < 5) {
+                codeRefs.current[index + 1]?.focus();
+              }
+            }}
+            onKeyPress={({ nativeEvent }) => {
+              if (nativeEvent.key === 'Backspace' && !digit && index > 0) {
+                const newCode = [...code];
+                newCode[index - 1] = '';
+                setCode(newCode);
+                codeRefs.current[index - 1]?.focus();
+              }
+            }}
+          />
+        ))}
+      </View>
+    );
+  }, [code]);
+
+  return (
+    <Modal
+      visible={visible}
+      animationType="slide"
+      transparent={true}
+      onRequestClose={() => {
+        setCode(['', '', '', '', '', '']);
+        onClose();
+      }}
+    >
+      <View style={styles.modalContainer}>
+        <View style={styles.modalContent}>
+          <TouchableOpacity
+            style={styles.closeButton}
+            onPress={() => {
+              setCode(['', '', '', '', '', '']);
+              onClose();
+            }}
+          >
+            <Text>
+              <XMarkIcon style={styles.closeButtonIcon} />
+            </Text>
+          </TouchableOpacity>
+
+          {/* Alerts */}
+          <View style={styles.alertsContainer}>
+            {showErrorAlert && (
+              <Alert
+                type="error"
+                title="Error"
+                message={errorMessage}
+                alertStyle="regular"
+                borderColor
+                onClose={() => setShowErrorAlert(false)}
+              />
+            )}
+            {showSuccessAlert && (
+              <Alert
+                type="success"
+                title="Verificación exitosa"
+                message="Redirigiendo a la página principal..."
+                alertStyle="regular"
+                borderColor
+                onClose={() => setShowSuccessAlert(false)}
+              />
+            )}
+          </View>
+
+          <Animated.View style={{ opacity: fadeAnim, flex: 1 }}>
+            <View style={styles.stepContainer}>
+              <PoppinsText weight="medium" style={styles.stepTitle}>
+                Confirma tu correo electrónico
+              </PoppinsText>
+              <PoppinsText weight="regular" style={styles.stepDescription}>
+                Introduce el código enviado a tu correo para confirmarlo
+              </PoppinsText>
+              {renderCodeInputs()}
+              <Button
+                title="Verificar"
+                onPress={handleVerifyCode}
+                style={styles.button}
+                size="medium"
+                loading={loading}
+              />
+              <TouchableOpacity
+                style={[styles.resendCodeButton, resending && { opacity: 0.5 }]} // Adjust opacity when disabled
+                onPress={handleResendCode}
+                disabled={resending} // Disable the button
+              >
+                <Text style={styles.resendCodeText}>on Reenviar código</Text>
+              </TouchableOpacity>
+              {resending && (
+                <Text style={styles.countdownText}>
+                  Puedes reenviar el código en {countdown} segundos
+                </Text>
+              )}
+            </View>
+          </Animated.View>
+        </View>
+      </View>
+    </Modal>
+  );
+}
+
+const styles = StyleSheet.create({
+  modalContainer: {
+    flex: 1,
+    justifyContent: 'flex-end',
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+  },
+  modalContent: {
+    height: 489,
+    backgroundColor: Colors.bgColor,
+    borderTopLeftRadius: 20,
+    borderTopRightRadius: 20,
+    paddingTop: 22 - 10,
+    paddingHorizontal: 20,
+  },
+  closeButton: {
+    position: 'absolute',
+    top: 10,
+    right: 20,
+    zIndex: 1000,
+  },
+  closeButtonIcon: {
+    width: 24,
+    height: 24,
+    color: Colors.textMain,
+  },
+  container: {
+    flexGrow: 1,
+    justifyContent: 'flex-start',
+    paddingTop: 56,
+    paddingHorizontal: 20,
+  },
+  stepContainer: {
+    width: '100%',
+    marginVertical: 21,
+  },
+  alertsContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  stepTitle: {
+    fontSize: FontSizes.h3.size,
+    lineHeight: FontSizes.h3.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 24,
+    textAlign: 'center',
+  },
+  stepDescription: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textLowContrast,
+    textAlign: 'center',
+    marginBottom: 24,
+  },
+  codeContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginHorizontal: 8,
+    marginBottom: 16,
+  },
+  codeInput: {
+    width: 42,
+    height: 48,
+    borderWidth: 1,
+    borderColor: Colors.stroke,
+    textAlign: 'center',
+    fontFamily: 'Poppins_400Regular',
+    color: Colors.textMain,
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    borderRadius: 8,
+    backgroundColor: Colors.menuWhite,
+    includeFontPadding: false,
+    padding: 0,
+    textAlignVertical: 'center',
+  },
+  button: {
+    marginTop: 21,
+    width: '100%',
+    height: 50,
+  },
+  resendCodeButton: {
+    alignSelf: 'flex-end',
+    marginTop: 21,
+  },
+  resendCodeText: {
+    color: Colors.secondaryLight,
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
+    fontFamily: 'Poppins_400Regular',
+  },
+  countdownText: {
+    marginTop: 8,
+    textAlign: 'center',
+    color: Colors.textLowContrast,
+    fontSize: FontSizes.b2.size,
+    fontFamily: 'Poppins_400Regular',
+  },
+});
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 354c81c..079f82a 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -144,4 +144,52 @@ export const AuthService = {
       };
     }
   },
+
+  validateOtp: async (otp: string): Promise<ServiceResponse> => {
+    try {
+      if (!/^\d{6}$/.test(otp)) {
+        return { success: false, error: 'El código debe tener 6 dígitos' };
+      }
+
+      const token = (await SecureStore.getItemAsync('auth_token')) || '';
+
+      if (!token) {
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      await api.auth.validateOtp(otp.trim(), token);
+
+      return { success: true, data: undefined };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  resendOtp: async (): Promise<ServiceResponse> => {
+    try {
+      const token = (await SecureStore.getItemAsync('auth_token')) || '';
+
+      if (!token) {
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      await api.auth.resendOtp(token);
+
+      return { success: true, data: undefined };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From dc9241591b747791ef12dd7653532927e6b76aca Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 30 Mar 2025 00:20:47 -0400
Subject: [PATCH 031/291] fix( implementando correctamente el resendOtp )

---
 src/screens/tab/EmailVerificationModal.tsx | 36 +++++++++++++++-------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index 4fb506e..c299151 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -23,14 +23,15 @@ export default function EmailVerificationModal({
   onClose: () => void;
 }) {
   const [resending, setResending] = useState(false);
-  const [countdown, setCountdown] = useState(0); // Countdown state
+  const [countdown, setCountdown] = useState(0);
   const fadeAnim = useRef(new Animated.Value(1)).current;
   const [loading, setLoading] = useState(false);
   const [code, setCode] = useState(['', '', '', '', '', '']);
   const codeRefs = useRef<Array<TextInput>>([]);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
-  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [showVerifySuccessAlert, setShowVerifySuccessAlert] = useState(false); // Alert for verifying code
+  const [showResendSuccessAlert, setShowResendSuccessAlert] = useState(false); // Alert for resending code
 
   useEffect(() => {
     let timer: NodeJS.Timeout;
@@ -55,9 +56,12 @@ export default function EmailVerificationModal({
     setLoading(true);
     try {
       await AuthService.validateOtp(enteredCode);
-      setShowSuccessAlert(true);
+      setShowVerifySuccessAlert(true);
       setCode(['', '', '', '', '', '']);
       setTimeout(() => onClose(), 2000);
+    } catch {
+      setErrorMessage('Error al verificar el código. Inténtalo nuevamente.');
+      setShowErrorAlert(true);
     } finally {
       setLoading(false);
     }
@@ -71,14 +75,14 @@ export default function EmailVerificationModal({
     try {
       const response = await AuthService.resendOtp();
       if (response.success) {
-        setShowSuccessAlert(true);
-        setErrorMessage('Código reenviado exitosamente.');
+        setShowResendSuccessAlert(true);
       } else {
         setErrorMessage(response.error || 'Error al reenviar el código.');
         setShowErrorAlert(true);
       }
-    } finally {
-      setResending(false);
+    } catch {
+      setErrorMessage('Error inesperado al reenviar el código.');
+      setShowErrorAlert(true);
     }
   };
 
@@ -155,14 +159,24 @@ export default function EmailVerificationModal({
                 onClose={() => setShowErrorAlert(false)}
               />
             )}
-            {showSuccessAlert && (
+            {showVerifySuccessAlert && (
               <Alert
                 type="success"
                 title="Verificación exitosa"
                 message="Redirigiendo a la página principal..."
                 alertStyle="regular"
                 borderColor
-                onClose={() => setShowSuccessAlert(false)}
+                onClose={() => setShowVerifySuccessAlert(false)}
+              />
+            )}
+            {showResendSuccessAlert && (
+              <Alert
+                type="success"
+                title="Código reenviado"
+                message="El código fue reenviado exitosamente."
+                alertStyle="regular"
+                borderColor
+                onClose={() => setShowResendSuccessAlert(false)}
               />
             )}
           </View>
@@ -186,9 +200,9 @@ export default function EmailVerificationModal({
               <TouchableOpacity
                 style={[styles.resendCodeButton, resending && { opacity: 0.5 }]} // Adjust opacity when disabled
                 onPress={handleResendCode}
-                disabled={resending} // Disable the button
+                disabled={resending}
               >
-                <Text style={styles.resendCodeText}>on Reenviar código</Text>
+                <Text style={styles.resendCodeText}>Reenviar código</Text>
               </TouchableOpacity>
               {resending && (
                 <Text style={styles.countdownText}>

From 164736d54569345c9bc3ed828a2d18c222a7d63b Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 30 Mar 2025 12:18:17 -0400
Subject: [PATCH 032/291] Verificacion de Correo implementado y mejora de
 estilos

---
 src/screens/tab/EmailVerificationModal.tsx | 86 +++++++++++++++-------
 1 file changed, 59 insertions(+), 27 deletions(-)

diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index c299151..baec7f5 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -24,14 +24,14 @@ export default function EmailVerificationModal({
 }) {
   const [resending, setResending] = useState(false);
   const [countdown, setCountdown] = useState(0);
-  const fadeAnim = useRef(new Animated.Value(1)).current;
   const [loading, setLoading] = useState(false);
   const [code, setCode] = useState(['', '', '', '', '', '']);
   const codeRefs = useRef<Array<TextInput>>([]);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
-  const [showVerifySuccessAlert, setShowVerifySuccessAlert] = useState(false); // Alert for verifying code
-  const [showResendSuccessAlert, setShowResendSuccessAlert] = useState(false); // Alert for resending code
+  const [showVerifySuccessAlert, setShowVerifySuccessAlert] = useState(false);
+  const [showResendSuccessAlert, setShowResendSuccessAlert] = useState(false);
+  const [showInvalidCodeMessage, setShowInvalidCodeMessage] = useState(false);
 
   useEffect(() => {
     let timer: NodeJS.Timeout;
@@ -55,12 +55,27 @@ export default function EmailVerificationModal({
 
     setLoading(true);
     try {
-      await AuthService.validateOtp(enteredCode);
-      setShowVerifySuccessAlert(true);
-      setCode(['', '', '', '', '', '']);
-      setTimeout(() => onClose(), 2000);
+      const response = await AuthService.validateOtp(enteredCode);
+
+      if (response.success) {
+        setShowVerifySuccessAlert(true);
+        setCode(['', '', '', '', '', '']);
+        setShowInvalidCodeMessage(false);
+        setTimeout(() => onClose(), 2000);
+      } else {
+        setErrorMessage(
+          response.error ||
+            'Error al verificar el código. Inténtalo nuevamente.',
+        );
+        if (response.error?.includes('I')) {
+          setShowInvalidCodeMessage(true);
+        }
+        setShowErrorAlert(true);
+      }
     } catch {
-      setErrorMessage('Error al verificar el código. Inténtalo nuevamente.');
+      setErrorMessage(
+        'Error inesperado al verificar el código. Inténtalo nuevamente.',
+      );
       setShowErrorAlert(true);
     } finally {
       setLoading(false);
@@ -105,6 +120,7 @@ export default function EmailVerificationModal({
               const cleanedText = text.replace(/[^0-9]/g, '');
               newCode[index] = cleanedText;
               setCode(newCode);
+              setShowInvalidCodeMessage(false);
               if (cleanedText && index < 5) {
                 codeRefs.current[index + 1]?.focus();
               }
@@ -114,6 +130,7 @@ export default function EmailVerificationModal({
                 const newCode = [...code];
                 newCode[index - 1] = '';
                 setCode(newCode);
+                setShowInvalidCodeMessage(false);
                 codeRefs.current[index - 1]?.focus();
               }
             }}
@@ -146,8 +163,6 @@ export default function EmailVerificationModal({
               <XMarkIcon style={styles.closeButtonIcon} />
             </Text>
           </TouchableOpacity>
-
-          {/* Alerts */}
           <View style={styles.alertsContainer}>
             {showErrorAlert && (
               <Alert
@@ -163,7 +178,7 @@ export default function EmailVerificationModal({
               <Alert
                 type="success"
                 title="Verificación exitosa"
-                message="Redirigiendo a la página principal..."
+                message="Correo Verificado"
                 alertStyle="regular"
                 borderColor
                 onClose={() => setShowVerifySuccessAlert(false)}
@@ -180,8 +195,7 @@ export default function EmailVerificationModal({
               />
             )}
           </View>
-
-          <Animated.View style={{ opacity: fadeAnim, flex: 1 }}>
+          <Animated.View style={[styles.fadeAnim, { flex: 1 }]}>
             <View style={styles.stepContainer}>
               <PoppinsText weight="medium" style={styles.stepTitle}>
                 Confirma tu correo electrónico
@@ -190,6 +204,11 @@ export default function EmailVerificationModal({
                 Introduce el código enviado a tu correo para confirmarlo
               </PoppinsText>
               {renderCodeInputs()}
+              {showInvalidCodeMessage && (
+                <PoppinsText style={styles.invalidCodeMessage}>
+                  Código incorrecto
+                </PoppinsText>
+              )}
               <Button
                 title="Verificar"
                 onPress={handleVerifyCode}
@@ -198,7 +217,10 @@ export default function EmailVerificationModal({
                 loading={loading}
               />
               <TouchableOpacity
-                style={[styles.resendCodeButton, resending && { opacity: 0.5 }]} // Adjust opacity when disabled
+                style={[
+                  styles.resendCodeButton,
+                  resending && styles.disabledButton,
+                ]}
                 onPress={handleResendCode}
                 disabled={resending}
               >
@@ -220,15 +242,18 @@ export default function EmailVerificationModal({
 const styles = StyleSheet.create({
   modalContainer: {
     flex: 1,
-    justifyContent: 'flex-end',
+    justifyContent: 'center',
+    alignItems: 'center',
     backgroundColor: 'rgba(0, 0, 0, 0.5)',
   },
   modalContent: {
     height: 489,
-    backgroundColor: Colors.bgColor,
-    borderTopLeftRadius: 20,
-    borderTopRightRadius: 20,
-    paddingTop: 22 - 10,
+    width: 350,
+    backgroundColor: Colors.textWhite,
+    borderRadius: 16,
+    borderWidth: 1,
+    borderColor: Colors.stroke,
+    paddingTop: 12,
     paddingHorizontal: 20,
   },
   closeButton: {
@@ -242,15 +267,10 @@ const styles = StyleSheet.create({
     height: 24,
     color: Colors.textMain,
   },
-  container: {
-    flexGrow: 1,
-    justifyContent: 'flex-start',
-    paddingTop: 56,
-    paddingHorizontal: 20,
-  },
   stepContainer: {
     width: '100%',
     marginVertical: 21,
+    marginTop: 70,
   },
   alertsContainer: {
     position: 'absolute',
@@ -314,9 +334,21 @@ const styles = StyleSheet.create({
   },
   countdownText: {
     marginTop: 8,
-    textAlign: 'center',
+    textAlign: 'right',
     color: Colors.textLowContrast,
-    fontSize: FontSizes.b2.size,
+    fontSize: FontSizes.b4.size,
     fontFamily: 'Poppins_400Regular',
   },
+  fadeAnim: {
+    opacity: 1,
+  },
+  disabledButton: {
+    opacity: 0.5,
+  },
+  invalidCodeMessage: {
+    color: Colors.semanticDanger,
+    fontSize: FontSizes.b2.size,
+    textAlign: 'left',
+    marginVertical: 8,
+  },
 });

From 8f27acb9984fc793d28f554eb0ab008eb980cabc Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 30 Mar 2025 12:23:22 -0400
Subject: [PATCH 033/291] Reubicando el mensaje de alerta fuera del modal

---
 src/screens/tab/EmailVerificationModal.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index baec7f5..2cc719a 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -277,7 +277,7 @@ const styles = StyleSheet.create({
     width: 326,
     left: '50%',
     marginLeft: -162,
-    top: 20,
+    top: -120,
     right: 0,
     zIndex: 1000,
   },

From f521f6aa860994635f83c018b618bdd2e3d7b994 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 30 Mar 2025 13:34:43 -0400
Subject: [PATCH 034/291] Updating to sdk version 0.3.6

---
 package-lock.json | 8 ++++----
 package.json      | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index cfa4096..8a0f149 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.4",
+        "@pharmatech/sdk": "^0.3.6",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.4",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.4.tgz",
-      "integrity": "sha512-NP+I322ez13uc6mdcNKiX4mMOCTjj89FIFKDZkOUHVYup0zHLWMbFawEr7Tnkc3iTwcbBFxhR4uEMqLKurH4dA==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.6.tgz",
+      "integrity": "sha512-Rhc2tmdrGSAf0JSRZlC1pGIF8XJrAImexFP9aG8gGv4cPg+NSc0AhPfZ2wQ6O+LSsZ1Mir8PowCOyOKy23xSRw==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 99322b0..fd5db02 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.4",
+    "@pharmatech/sdk": "^0.3.6",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",

From 2ff889d96ec5fa7270bb9ae2f62feedbab10f116 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 18:28:38 -0400
Subject: [PATCH 035/291] Refactor product detail routing and product data

---
 package-lock.json                   |   8 +-
 package.json                        |   2 +-
 src/app/_layout.tsx                 |   2 +-
 src/app/productDetail.tsx           |   2 -
 src/app/products/[id].tsx           |   2 +
 src/app/products/_layout.tsx        |   0
 src/components/Card.tsx             |   2 +-
 src/screens/ProductDetailScreen.tsx | 229 ++++++++++++++++++++--------
 src/services/products.ts            |   7 +-
 9 files changed, 180 insertions(+), 74 deletions(-)
 delete mode 100644 src/app/productDetail.tsx
 create mode 100644 src/app/products/[id].tsx
 create mode 100644 src/app/products/_layout.tsx

diff --git a/package-lock.json b/package-lock.json
index d96d23d..05c84bf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.4",
+        "@pharmatech/sdk": "^0.3.6",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.5.tgz",
-      "integrity": "sha512-GqomIP6TvEa7r0hQXBJg/OOLYRo44Cfeq7EDh2vyJ9FYCg4iHV+C2+JH4BN0R1d65eUuBtlhxuU+r78juUjO6g==",
+      "version": "0.3.6",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.6.tgz",
+      "integrity": "sha512-Rhc2tmdrGSAf0JSRZlC1pGIF8XJrAImexFP9aG8gGv4cPg+NSc0AhPfZ2wQ6O+LSsZ1Mir8PowCOyOKy23xSRw==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 99322b0..fd5db02 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.4",
+    "@pharmatech/sdk": "^0.3.6",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 9ee07b6..a0b7563 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -57,7 +57,7 @@ export default function RootLayout() {
         <Stack.Screen name="index" redirect={true} />
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="productDetail" options={{ headerShown: false }} />
+        <Stack.Screen name="products/[id]" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/productDetail.tsx b/src/app/productDetail.tsx
deleted file mode 100644
index 3ca7330..0000000
--- a/src/app/productDetail.tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import ProductDetailScreen from '../screens/ProductDetailScreen';
-export default ProductDetailScreen;
diff --git a/src/app/products/[id].tsx b/src/app/products/[id].tsx
new file mode 100644
index 0000000..bdf1230
--- /dev/null
+++ b/src/app/products/[id].tsx
@@ -0,0 +1,2 @@
+import ProductDetailScreen from '../../screens/ProductDetailScreen';
+export default ProductDetailScreen;
diff --git a/src/app/products/_layout.tsx b/src/app/products/_layout.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index b0ab0e7..5bffd62 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -21,7 +21,7 @@ const ProductCard: React.FC<Product> = ({
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
   return (
-    <TouchableOpacity onPress={() => router.push('/productDetail')}>
+    <TouchableOpacity onPress={() => router.push('/products/' + id)}>
       <View style={styles.card}>
         <View
           style={{
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 59266c3..f4ceb0a 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -1,7 +1,6 @@
 import React, { useState, useRef, useEffect } from 'react';
 import {
   View,
-  Text,
   Image,
   ScrollView,
   StyleSheet,
@@ -11,7 +10,10 @@ import {
   NativeSyntheticEvent,
   NativeScrollEvent,
 } from 'react-native';
+import { useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
+import { useCart } from '../hooks/useCart';
+import { Product as CardProduct } from '../types/Product';
 import { CheckCircleIcon, StarIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
@@ -19,60 +21,108 @@ import CardButton from '../components/CardButton';
 import PoppinsText from '../components/PoppinsText';
 import { ProductService } from '../services/products';
 import { TruckIcon } from 'react-native-heroicons/outline';
-//import Carousel from '../components/Carousel';
+import Carousel from '../components/Carousel';
 
 type Product = {
   id: string;
   name: string;
-  price: number;
   description: string;
   rating: number;
+  discount: number;
+  presentation: { id: string; description: string; price: number }[];
   images: string[];
 };
 
 const ProductDetailScreen: React.FC = () => {
-  const [userRating, setUserRating] = useState<number>(0); // 0 significa no calificado
-  const [hoverRating, setHoverRating] = useState<number>(0); // Para efecto hover
+  const { id } = useLocalSearchParams<{ id: string }>();
+
+  const [product, setProduct] = useState<Product>();
+  const [products, setProducts] = useState<CardProduct[]>([]);
+  const [userRating, setUserRating] = useState<number>(0);
+  const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
+  const [currentPrice, setCurrentPrice] = useState<number>(0);
   const imagesScrollRef = useRef<ScrollView>(null);
 
-  const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-    const contentOffsetX = event.nativeEvent.contentOffset.x;
-    const newIndex = Math.round(contentOffsetX / width);
-    setCurrentImageIndex(newIndex);
+  const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
+    useCart();
+
+  const getQuantity = (): number => {
+    return product?.id ? getItemQuantity(product.id) : 0;
   };
 
-  const scrollToImage = (index: number) => {
-    setCurrentImageIndex(index);
-    if (imagesScrollRef.current) {
-      imagesScrollRef.current.scrollTo({
-        x: index * width,
-        animated: true,
-      });
+  const obtainProducts = async () => {
+    const productsData = await ProductService.getProducts(1, 20);
+
+    if (productsData.success) {
+      const pd = productsData.data.results;
+      const carouselProducts = pd.map((p) => ({
+        id: p.product.id,
+        imageUrl: p.product.images[0].url,
+        name: p.product.name,
+        category: p.product.categories[0].name,
+        originalPrice: p.price,
+        discount: 10,
+        finalPrice: p.price - p.price * 0.1,
+        quantity: getItemQuantity(p.product.id),
+        getQuantity: (quantity: number) => {
+          addToCart({
+            id: p.product.id,
+            name: p.product.name,
+            price: p.price,
+            quantity,
+            image: p.product.images[0].url,
+          });
+          updateCartQuantity(p.product.id, quantity);
+        },
+      }));
+
+      setProducts(carouselProducts);
+    } else {
+      console.log(productsData.error);
     }
   };
 
-  // Datos de ejemplo del producto
-  const product: Product = {
-    id: '1',
-    name: 'Acetaminofen 650mg Genven Caja x 10 tabletas',
-    price: 129.99,
-    description:
-      'Zapatillas de running con tecnología de amortiguación avanzada.',
-    rating: 4.8,
-    images: [
-      'https://wallpapers.com/images/featured/imagenes-lindas-para-perfil-estetico-r521rmfa6ucixtw5.jpg',
-      'https://r-charts.com/es/miscelanea/procesamiento-imagenes-magick_files/figure-html/color-fondo-imagen-r.png',
-      'https://img.freepik.com/vector-gratis/cute-cool-boy-dabbing-pose-dibujos-animados-vector-icono-ilustracion-concepto-icono-moda-personas-aislado_138676-5680.jpg',
-    ],
+  const changePresentation = (description: string) => {
+    const presentation = product?.presentation.find(
+      (p) => p.description === description,
+    );
+    if (presentation && 'price' in presentation)
+      setCurrentPrice(presentation.price);
   };
 
+  useEffect(() => {
+    obtainProducts();
+  }, [cartItems]);
+
   useEffect(() => {
     const obtainProducts = async () => {
-      const productsData = await ProductService.getProduct(1);
+      const productsData = await ProductService.getProduct(id);
 
       if (productsData.success) {
-        console.log(productsData);
+        setProduct({
+          id: productsData.data.id,
+          name: productsData.data.name,
+          description: productsData.data.description,
+          rating: productsData.data.rating,
+          images: productsData.data.images.map(
+            (image: { url: string }) => image.url,
+          ),
+          discount: 10,
+          presentation: productsData.data.presentation.map(
+            (presentation: {
+              id: string;
+              presentation: { description: string };
+              price: number;
+            }) => ({
+              id: presentation.id,
+              description: presentation.presentation.description,
+              price: presentation.price,
+            }),
+          ),
+        });
+
+        setCurrentPrice(productsData.data.presentation[0].price);
       } else {
         console.log(productsData.error);
       }
@@ -80,13 +130,28 @@ const ProductDetailScreen: React.FC = () => {
     obtainProducts();
   }, []);
 
+  const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+    const contentOffsetX = event.nativeEvent.contentOffset.x;
+    const newIndex = Math.round(contentOffsetX / width);
+    setCurrentImageIndex(newIndex);
+  };
+
+  const scrollToImage = (index: number) => {
+    setCurrentImageIndex(index);
+    if (imagesScrollRef.current) {
+      imagesScrollRef.current.scrollTo({
+        x: index * width,
+        animated: true,
+      });
+    }
+  };
+
   const handleRating = (rating: number) => {
     setUserRating(rating);
     // Aquí podrías enviar la calificación a tu API
     console.log('Calificación enviada:', rating);
   };
 
-  // Componente de estrellas de calificación
   const RatingStars = () => {
     return (
       <View style={styles.ratingStarsContainer}>
@@ -101,7 +166,9 @@ const ProductDetailScreen: React.FC = () => {
             <StarIcon
               size={32}
               color={
-                star <= (hoverRating || userRating) ? '#FFD700' : '#CCCCCC'
+                star <= (hoverRating || userRating)
+                  ? Colors.semanticWarning
+                  : Colors.gray_100
               }
               style={styles.starIcon}
             />
@@ -124,7 +191,7 @@ const ProductDetailScreen: React.FC = () => {
             showsHorizontalScrollIndicator={false}
             onMomentumScrollEnd={handleScroll}
           >
-            {product.images.map((image, index) => (
+            {product?.images.map((image, index) => (
               <Image
                 key={index}
                 source={{ uri: image }}
@@ -136,7 +203,7 @@ const ProductDetailScreen: React.FC = () => {
 
           {/* Indicadores de imágenes */}
           <View style={styles.imageIndicators}>
-            {product.images.map((_, index) => (
+            {product?.images.map((_, index) => (
               <TouchableOpacity
                 key={index}
                 onPress={() => scrollToImage(index)}
@@ -151,26 +218,27 @@ const ProductDetailScreen: React.FC = () => {
             ))}
           </View>
 
-          <PoppinsText style={styles.productName}>{product.name}</PoppinsText>
+          <PoppinsText style={styles.productName}>{product?.name}</PoppinsText>
 
           <RatingStars />
           {userRating > 0 && (
-            <Text style={styles.ratingFeedback}>
+            <PoppinsText style={styles.ratingFeedback}>
               ¡Gracias por tu calificación de {userRating} estrella
               {userRating !== 1 ? 's' : ''}!
-            </Text>
+            </PoppinsText>
           )}
 
           <PoppinsText style={styles.description}>
-            {product.description}
+            {product?.description}
           </PoppinsText>
 
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
-              <PoppinsText style={styles.price}>
-                Bs {product.price.toFixed(2)}
-              </PoppinsText>
+              <PoppinsText style={styles.price}>$ {currentPrice}</PoppinsText>
+              {product?.discount && (
+                <PoppinsText>{product.discount}</PoppinsText>
+              )}
             </View>
             <PoppinsText style={styles.sectionTitle}>
               Selecciona la presentación
@@ -178,9 +246,13 @@ const ProductDetailScreen: React.FC = () => {
             <View style={styles.quantitySelector}>
               <Dropdown
                 placeholder="Presentación..."
-                options={['A', 'B', 'c']}
+                options={
+                  product?.presentation.map(
+                    (p: { description: string }) => p.description,
+                  ) || []
+                }
                 borderColor={Colors.gray_100}
-                onSelect={() => console.log('p')}
+                onSelect={(e) => changePresentation(e)}
               />
             </View>
             <PoppinsText
@@ -255,18 +327,65 @@ const ProductDetailScreen: React.FC = () => {
                   </PoppinsText>
                 </View>
               </View>
+              <View style={styles.availableCard}>
+                <View style={{ padding: 10, paddingHorizontal: 16 }}>
+                  <PoppinsText style={styles.sectionTitle}>
+                    Pharmatech Sambil Barquisimeto
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.b3.size,
+                      color: Colors.textLowContrast,
+                    }}
+                  >
+                    Av. Venezuela con Av. Bracamonte
+                  </PoppinsText>
+                </View>
+                <View
+                  style={{
+                    width: '100%',
+                    alignItems: 'flex-end',
+                    paddingHorizontal: 20,
+                  }}
+                >
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.c1.size,
+                      color: Colors.textLowContrast,
+                    }}
+                  >
+                    11 unidades{' '}
+                    <CheckCircleIcon size={15} color={Colors.semanticSuccess} />
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{
+                      fontSize: FontSizes.c3.size,
+                      color: Colors.gray_500,
+                    }}
+                  >
+                    <TruckIcon size={15} color={Colors.gray_500} /> Envio en
+                    menos de 3h
+                  </PoppinsText>
+                </View>
+              </View>
             </View>
             <PoppinsText style={styles.sectionTitle}>
               Productos relacionados
             </PoppinsText>
             <View style={styles.quantitySelector}>
-              {/* <Carousel cards={} /> */}
+              <Carousel cards={products} />
             </View>
           </View>
         </ScrollView>
 
         <View style={styles.cardButtonContainer}>
-          <CardButton initialValue={0} size={10} />
+          <CardButton
+            size={10}
+            getValue={(quantity) => {
+              if (product?.id) updateCartQuantity(product.id, quantity);
+            }}
+            initialValue={getQuantity()}
+          />
         </View>
       </SafeAreaView>
     </View>
@@ -283,7 +402,7 @@ const styles = StyleSheet.create({
   },
   productImage: {
     width: width,
-    height: 250,
+    height: 200,
   },
   imageIndicators: {
     flexDirection: 'row',
@@ -316,15 +435,6 @@ const styles = StyleSheet.create({
     fontWeight: 'bold',
     color: Colors.primary,
   },
-  ratingContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  ratingText: {
-    marginLeft: 4,
-    fontSize: 16,
-    color: '#666666',
-  },
   productName: {
     textAlign: 'center',
     fontSize: FontSizes.h5.size,
@@ -336,7 +446,7 @@ const styles = StyleSheet.create({
     color: Colors.textLowContrast,
     marginHorizontal: 20,
     marginBottom: 20,
-    lineHeight: 24,
+    lineHeight: 20,
   },
   sectionTitle: {
     fontSize: FontSizes.s2.size,
@@ -352,11 +462,6 @@ const styles = StyleSheet.create({
     padding: 16,
     backgroundColor: '',
   },
-  addToCartText: {
-    color: '#FFFFFF',
-    fontSize: 18,
-    fontWeight: '600',
-  },
   ratingStarsContainer: {
     flexDirection: 'row',
     marginBottom: 20,
diff --git a/src/services/products.ts b/src/services/products.ts
index fc66d36..6a2dd50 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -26,10 +26,11 @@ export const ProductService = {
     }
   },
 
-  getProduct: async (id: number): Promise<ProductPresentation> => {
+  getProduct: async (id: string): Promise<ProductPresentation> => {
     try {
-      console.log(id);
-      const product = await api.country.findAll({ page: 1, limit: 10 });
+      const product: ProductPresentation = await api.genericProduct.getById(id);
+      product.presentation = await api.productPresentation.getByProductId(id);
+      product.images = await api.productImage.getByProductId(id);
 
       return { success: true, data: product };
     } catch (error) {

From c83e56c5a587f57fccfa70da867ab730786f0f74 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 18:36:28 -0400
Subject: [PATCH 036/291] Enhance ProductDetailScreen: format discount display
 and adjust styles

---
 src/screens/ProductDetailScreen.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index f4ceb0a..875fc7f 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -237,7 +237,9 @@ const ProductDetailScreen: React.FC = () => {
             <View style={styles.priceRatingContainer}>
               <PoppinsText style={styles.price}>$ {currentPrice}</PoppinsText>
               {product?.discount && (
-                <PoppinsText>{product.discount}</PoppinsText>
+                <PoppinsText style={styles.discount}>
+                  -{product.discount}%
+                </PoppinsText>
               )}
             </View>
             <PoppinsText style={styles.sectionTitle}>
@@ -426,7 +428,6 @@ const styles = StyleSheet.create({
   },
   priceRatingContainer: {
     flexDirection: 'row',
-    justifyContent: 'space-between',
     alignItems: 'center',
     marginBottom: 8,
   },
@@ -434,6 +435,7 @@ const styles = StyleSheet.create({
     fontSize: 24,
     fontWeight: 'bold',
     color: Colors.primary,
+    marginRight: 10,
   },
   productName: {
     textAlign: 'center',
@@ -502,6 +504,12 @@ const styles = StyleSheet.create({
     alignItems: 'flex-end',
     zIndex: 999,
   },
+  discount: {
+    fontSize: FontSizes.b4.size,
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 5,
+    padding: 4,
+  },
 });
 
 export default ProductDetailScreen;

From 9e31c8b93aec38fc463325d2ed07746312986055 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 18:37:33 -0400
Subject: [PATCH 037/291] Remove unused ImageCarousel component

---
 src/components/ImageCarousel.tsx | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 src/components/ImageCarousel.tsx

diff --git a/src/components/ImageCarousel.tsx b/src/components/ImageCarousel.tsx
deleted file mode 100644
index e69de29..0000000

From d3ad1759dee16a1bd69df83c96d473c52bd8d12d Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 18:45:56 -0400
Subject: [PATCH 038/291] Add StateService and integrate state selection in
 ProductDetailScreen

---
 src/screens/ProductDetailScreen.tsx | 10 +++++++++-
 src/services/state.ts               | 24 ++++++++++++++++++++++++
 src/types/api.d.ts                  |  4 ++++
 3 files changed, 37 insertions(+), 1 deletion(-)
 create mode 100644 src/services/state.ts

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 875fc7f..44543b6 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -22,6 +22,8 @@ import PoppinsText from '../components/PoppinsText';
 import { ProductService } from '../services/products';
 import { TruckIcon } from 'react-native-heroicons/outline';
 import Carousel from '../components/Carousel';
+import { StateService } from '../services/state';
+import { State } from '../types/api';
 
 type Product = {
   id: string;
@@ -36,6 +38,7 @@ type Product = {
 const ProductDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
 
+  const [states, setStates] = useState<State[]>([]);
   const [product, setProduct] = useState<Product>();
   const [products, setProducts] = useState<CardProduct[]>([]);
   const [userRating, setUserRating] = useState<number>(0);
@@ -98,6 +101,11 @@ const ProductDetailScreen: React.FC = () => {
   useEffect(() => {
     const obtainProducts = async () => {
       const productsData = await ProductService.getProduct(id);
+      const states = await StateService.getStates(1, 40);
+
+      if (states.success) {
+        setStates(states.data.results);
+      }
 
       if (productsData.success) {
         setProduct({
@@ -282,7 +290,7 @@ const ProductDetailScreen: React.FC = () => {
             <View style={styles.quantitySelector}>
               <Dropdown
                 placeholder="Estado..."
-                options={['Lara', 'Anzoategui', 'Caracas']}
+                options={states.map((state) => state.name)}
                 borderColor={Colors.gray_100}
                 onSelect={() => console.log('p')}
               />
diff --git a/src/services/state.ts b/src/services/state.ts
new file mode 100644
index 0000000..1291b6d
--- /dev/null
+++ b/src/services/state.ts
@@ -0,0 +1,24 @@
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse, Pagination, State } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const StateService = {
+  getStates: async (
+    page: number,
+    limit: number,
+  ): Promise<ServiceResponse<Pagination<State>>> => {
+    try {
+      const states = await api.state.findAll({
+        page: page,
+        limit: limit,
+      });
+
+      return { success: true, data: states };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 398447e..40e98d8 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -76,3 +76,7 @@ type UserList = BaseModel & {
   isValidated: boolean;
   profile: Profile;
 };
+
+type State = {
+  name: string;
+};

From 54ccb21a0c7fc964ba49b26042cd81120cd74250 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 30 Mar 2025 19:08:08 -0400
Subject: [PATCH 039/291] Fixing to proper logout

---
 package-lock.json                    |  8 ++++----
 package.json                         |  2 +-
 src/lib/sdkConfig.ts                 | 21 ++++++++++++++++++++-
 src/screens/tab/CategoriesScreen.tsx | 12 +++---------
 src/services/auth.ts                 | 13 +++++++++++++
 5 files changed, 41 insertions(+), 15 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8a0f149..173f644 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.6",
+        "@pharmatech/sdk": "^0.3.7",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.6",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.6.tgz",
-      "integrity": "sha512-Rhc2tmdrGSAf0JSRZlC1pGIF8XJrAImexFP9aG8gGv4cPg+NSc0AhPfZ2wQ6O+LSsZ1Mir8PowCOyOKy23xSRw==",
+      "version": "0.3.7",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.7.tgz",
+      "integrity": "sha512-K19zZbULnpz3DcKCfVW6gSU7R63bipXJ3dsUq8GU/hAvHaw1LrrjdgUVVvlzvbNO5xCeGx8kfqSP7IZxtdA76g==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index fd5db02..fd3f6e8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.6",
+    "@pharmatech/sdk": "^0.3.7",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/lib/sdkConfig.ts b/src/lib/sdkConfig.ts
index f578bac..3f0e513 100644
--- a/src/lib/sdkConfig.ts
+++ b/src/lib/sdkConfig.ts
@@ -1,12 +1,31 @@
 import { PharmaTech } from '@pharmatech/sdk';
+import * as SecureStore from 'expo-secure-store';
 import { PHARMATECH_DEV_MODE } from '@env';
+import { AxiosRequestConfig } from 'axios'; // Importa el tipo AxiosRequestConfig
 
 const isDevelopment = PHARMATECH_DEV_MODE === 'true';
 
-// Instancia del SDK para solicitudes con Origin
 export const api = new PharmaTech(
   isDevelopment,
   isDevelopment
     ? 'http://localhost:3000' // Origin para desarrollo
     : 'https://pharmatech.site', // Origin para producción
 );
+
+// Configurar un interceptor para manejar dinámicamente el JWT
+api.client['client'].interceptors.request.use(
+  async (config: AxiosRequestConfig) => {
+    const token = await SecureStore.getItemAsync('auth_token');
+    if (token) {
+      config.headers = {
+        ...config.headers,
+        Authorization: `Bearer ${token}`,
+      };
+    } else {
+      if (config.headers) {
+        delete config.headers['Authorization'];
+      }
+    }
+    return config;
+  },
+);
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index 7dc672e..d9062f1 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -4,9 +4,8 @@ import PoppinsText from '../../components/PoppinsText';
 import Button from '../../components/Button';
 import { useRouter } from 'expo-router';
 import { Colors } from '../../styles/theme';
-import * as SecureStore from 'expo-secure-store';
 import Popup from '../../components/Popup';
-import * as Updates from 'expo-updates';
+import { AuthService } from '../../services/auth';
 
 export default function CategoriesScreen() {
   const router = useRouter();
@@ -14,13 +13,8 @@ export default function CategoriesScreen() {
 
   const handleLogout = async () => {
     try {
-      // Eliminating user data from SecureStore
-      await SecureStore.deleteItemAsync('user_data');
-      await SecureStore.deleteItemAsync('auth_token');
-      await SecureStore.deleteItemAsync('reset_token');
-
-      // Forcing app reload
-      await Updates.reloadAsync();
+      await AuthService.logout(); // Llama al método logout del servicio de autenticación
+      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
     } catch (error) {
       console.error('Error al cerrar sesión:', error);
     }
diff --git a/src/services/auth.ts b/src/services/auth.ts
index e23f64e..4a77ba1 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -157,4 +157,17 @@ export const AuthService = {
       };
     }
   },
+
+  logout: async (): Promise<void> => {
+    try {
+      // Eliminar el token del SecureStore
+      await SecureStore.deleteItemAsync('auth_token');
+
+      // Eliminar los interceptores configurados en el cliente HTTP
+      const interceptors = api.client['client'].interceptors.request;
+      interceptors.handlers = []; // Limpia todos los interceptores configurados
+    } catch (error) {
+      console.error('Error al cerrar sesión:', error);
+    }
+  },
 };

From 66709de6699bde112599a87b40f25e1d6159c150 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 30 Mar 2025 20:42:11 -0400
Subject: [PATCH 040/291] posicion de las alertas y tiempo en pantalla

---
 src/screens/tab/EmailVerificationModal.tsx | 23 +++++++++++++++++++++-
 1 file changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index 2cc719a..c354ad0 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -45,6 +45,27 @@ export default function EmailVerificationModal({
     return () => clearInterval(timer);
   }, [resending, countdown]);
 
+  useEffect(() => {
+    if (showErrorAlert) {
+      const timer = setTimeout(() => setShowErrorAlert(false), 4000);
+      return () => clearTimeout(timer);
+    }
+  }, [showErrorAlert]);
+
+  useEffect(() => {
+    if (showVerifySuccessAlert) {
+      const timer = setTimeout(() => setShowVerifySuccessAlert(false), 4000);
+      return () => clearTimeout(timer);
+    }
+  }, [showVerifySuccessAlert]);
+
+  useEffect(() => {
+    if (showResendSuccessAlert) {
+      const timer = setTimeout(() => setShowResendSuccessAlert(false), 4000);
+      return () => clearTimeout(timer);
+    }
+  }, [showResendSuccessAlert]);
+
   const handleVerifyCode = async () => {
     const enteredCode = code.join('');
     if (enteredCode.length !== 6) {
@@ -277,7 +298,7 @@ const styles = StyleSheet.create({
     width: 326,
     left: '50%',
     marginLeft: -162,
-    top: -120,
+    top: 20,
     right: 0,
     zIndex: 1000,
   },

From 1de8078f7860030e443d22a961ee39e15f18d7e5 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 30 Mar 2025 21:15:07 -0400
Subject: [PATCH 041/291] Adding 'volver' to product details

---
 src/screens/ProductDetailScreen.tsx | 32 +++++++++++++++++++++++++++--
 1 file changed, 30 insertions(+), 2 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 44543b6..569b954 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -14,7 +14,11 @@ import { useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
 import { useCart } from '../hooks/useCart';
 import { Product as CardProduct } from '../types/Product';
-import { CheckCircleIcon, StarIcon } from 'react-native-heroicons/solid';
+import {
+  CheckCircleIcon,
+  StarIcon,
+  ChevronLeftIcon,
+} from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
 import CardButton from '../components/CardButton';
@@ -24,6 +28,7 @@ import { TruckIcon } from 'react-native-heroicons/outline';
 import Carousel from '../components/Carousel';
 import { StateService } from '../services/state';
 import { State } from '../types/api';
+import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
 
 type Product = {
   id: string;
@@ -37,6 +42,7 @@ type Product = {
 
 const ProductDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
+  const navigation = useNavigation(); // Obtén la instancia de navegación
 
   const [states, setStates] = useState<State[]>([]);
   const [product, setProduct] = useState<Product>();
@@ -187,8 +193,30 @@ const ProductDetailScreen: React.FC = () => {
   };
 
   return (
-    <View style={{ flex: 1 }}>
+    <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
+      {/* Botón de volver */}
+      <TouchableOpacity
+        onPress={() => navigation.goBack()} // Navega a la pantalla anterior
+        style={{ padding: 10, flexDirection: 'row', alignItems: 'center' }}
+      >
+        <ChevronLeftIcon
+          width={16}
+          height={16}
+          color={Colors.primary}
+          style={{ marginRight: 2, marginLeft: 6 }} // Espacio entre el ícono y el texto
+        />
+        <PoppinsText
+          weight="medium"
+          style={{
+            fontSize: FontSizes.b1.size,
+            lineHeight: FontSizes.b1.lineHeight,
+            color: Colors.primary,
+          }}
+        >
+          Volver
+        </PoppinsText>
+      </TouchableOpacity>
       <SafeAreaView style={styles.container}>
         <ScrollView>
           {/* Carrusel de imágenes */}

From 603a31a4a6f54b4e006adc6196cd6973fabe03cf Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 21:23:51 -0400
Subject: [PATCH 042/291] Add inventory management to ProductDetailScreen and
 create InventoryService

---
 src/screens/ProductDetailScreen.tsx | 164 ++++++++++++++--------------
 src/services/inventory.ts           |  26 +++++
 src/types/api.d.ts                  |   6 +
 3 files changed, 113 insertions(+), 83 deletions(-)
 create mode 100644 src/services/inventory.ts

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 44543b6..cbee16c 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -23,7 +23,8 @@ import { ProductService } from '../services/products';
 import { TruckIcon } from 'react-native-heroicons/outline';
 import Carousel from '../components/Carousel';
 import { StateService } from '../services/state';
-import { State } from '../types/api';
+import { Inventory, State } from '../types/api';
+import { InventoryService } from '../services/inventory';
 
 type Product = {
   id: string;
@@ -38,6 +39,7 @@ type Product = {
 const ProductDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
 
+  const [inventory, setInventory] = useState<Inventory[]>([]);
   const [states, setStates] = useState<State[]>([]);
   const [product, setProduct] = useState<Product>();
   const [products, setProducts] = useState<CardProduct[]>([]);
@@ -129,12 +131,43 @@ const ProductDetailScreen: React.FC = () => {
             }),
           ),
         });
+        for (const p of product?.presentation || []) {
+          const inventoryData = await InventoryService.getPresentationInventory(
+            1,
+            20,
+            p.id || '',
+          );
+          if (inventoryData.success) {
+            const newInventory = inventoryData.data.results.map((inv) => ({
+              id: inv.id,
+              branch: {
+                id: inv.branch.id,
+                name: inv.branch.name,
+                address: inv.branch.address,
+                stockQuantity: inv.stockQuantity,
+              },
+            }));
+
+            setInventory((prevInventory) => {
+              const updatedInventory = [...prevInventory];
+              newInventory.forEach((newItem) => {
+                if (!prevInventory.some((item) => item.id === newItem.id)) {
+                  updatedInventory.push(newItem);
+                }
+              });
+              return updatedInventory;
+            });
+          } else {
+            console.error(inventoryData.error);
+          }
+        }
 
         setCurrentPrice(productsData.data.presentation[0].price);
       } else {
         console.log(productsData.error);
       }
     };
+
     obtainProducts();
   }, []);
 
@@ -296,88 +329,53 @@ const ProductDetailScreen: React.FC = () => {
               />
             </View>
             <View style={styles.availableContainer}>
-              <View style={styles.availableCard}>
-                <View style={{ padding: 10, paddingHorizontal: 16 }}>
-                  <PoppinsText style={styles.sectionTitle}>
-                    Pharmatech Sambil Barquisimeto
-                  </PoppinsText>
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.b3.size,
-                      color: Colors.textLowContrast,
-                    }}
-                  >
-                    Av. Venezuela con Av. Bracamonte
-                  </PoppinsText>
-                </View>
-                <View
-                  style={{
-                    width: '100%',
-                    alignItems: 'flex-end',
-                    paddingHorizontal: 20,
-                  }}
-                >
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.c1.size,
-                      color: Colors.textLowContrast,
-                    }}
-                  >
-                    150 unidades{' '}
-                    <CheckCircleIcon size={15} color={Colors.semanticSuccess} />
-                  </PoppinsText>
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.c3.size,
-                      color: Colors.gray_500,
-                    }}
-                  >
-                    <TruckIcon size={15} color={Colors.gray_500} /> Envio en
-                    menos de 3h
-                  </PoppinsText>
-                </View>
-              </View>
-              <View style={styles.availableCard}>
-                <View style={{ padding: 10, paddingHorizontal: 16 }}>
-                  <PoppinsText style={styles.sectionTitle}>
-                    Pharmatech Sambil Barquisimeto
-                  </PoppinsText>
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.b3.size,
-                      color: Colors.textLowContrast,
-                    }}
-                  >
-                    Av. Venezuela con Av. Bracamonte
-                  </PoppinsText>
-                </View>
-                <View
-                  style={{
-                    width: '100%',
-                    alignItems: 'flex-end',
-                    paddingHorizontal: 20,
-                  }}
-                >
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.c1.size,
-                      color: Colors.textLowContrast,
-                    }}
-                  >
-                    11 unidades{' '}
-                    <CheckCircleIcon size={15} color={Colors.semanticSuccess} />
-                  </PoppinsText>
-                  <PoppinsText
-                    style={{
-                      fontSize: FontSizes.c3.size,
-                      color: Colors.gray_500,
-                    }}
-                  >
-                    <TruckIcon size={15} color={Colors.gray_500} /> Envio en
-                    menos de 3h
-                  </PoppinsText>
-                </View>
-              </View>
+              {inventory &&
+                inventory.map((inv) => (
+                  <View key={inv.id} style={styles.availableCard}>
+                    <View style={{ padding: 10, paddingHorizontal: 16 }}>
+                      <PoppinsText style={styles.sectionTitle}>
+                        {inv.branch.name}
+                      </PoppinsText>
+                      <PoppinsText
+                        style={{
+                          fontSize: FontSizes.b3.size,
+                          color: Colors.textLowContrast,
+                        }}
+                      >
+                        {inv.branch.address}
+                      </PoppinsText>
+                    </View>
+                    <View
+                      style={{
+                        width: '100%',
+                        alignItems: 'flex-end',
+                        paddingHorizontal: 20,
+                      }}
+                    >
+                      <PoppinsText
+                        style={{
+                          fontSize: FontSizes.c1.size,
+                          color: Colors.textLowContrast,
+                        }}
+                      >
+                        {inv.branch.stockQuantity} unidades{' '}
+                        <CheckCircleIcon
+                          size={15}
+                          color={Colors.semanticSuccess}
+                        />
+                      </PoppinsText>
+                      <PoppinsText
+                        style={{
+                          fontSize: FontSizes.c3.size,
+                          color: Colors.gray_500,
+                        }}
+                      >
+                        <TruckIcon size={15} color={Colors.gray_500} /> Envio en
+                        menos de 3h
+                      </PoppinsText>
+                    </View>
+                  </View>
+                ))}
             </View>
             <PoppinsText style={styles.sectionTitle}>
               Productos relacionados
diff --git a/src/services/inventory.ts b/src/services/inventory.ts
new file mode 100644
index 0000000..fb9406d
--- /dev/null
+++ b/src/services/inventory.ts
@@ -0,0 +1,26 @@
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse, Pagination, Inventory } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const InventoryService = {
+  getPresentationInventory: async (
+    page: number,
+    limit: number,
+    presentationId: string,
+  ): Promise<ServiceResponse<Pagination<Inventory>>> => {
+    try {
+      const inventory = await api.inventory.findAll({
+        page: page,
+        limit: limit,
+        productPresentationId: presentationId,
+      });
+
+      return { success: true, data: inventory };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 40e98d8..2fb6cf6 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -80,3 +80,9 @@ type UserList = BaseModel & {
 type State = {
   name: string;
 };
+
+type Inventory = BaseModel & {
+  stockQuantity: number;
+  branch: BranchResponse;
+  productPresentation: ProductPresentation;
+};

From b9e3e10b0483e474ecbbd410f1d387e928c0cc55 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 21:40:45 -0400
Subject: [PATCH 043/291] Update Card component styles for improved layout and
 spacing

---
 src/components/Card.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 5bffd62..bbb9c9b 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -92,6 +92,7 @@ const styles = StyleSheet.create({
     marginBottom: 16,
     maxWidth: 140,
     minWidth: 140,
+    minHeight: 270,
     maxHeight: 300,
   },
   tag: {
@@ -119,7 +120,8 @@ const styles = StyleSheet.create({
     zIndex: 999,
   },
   description: {
-    marginHorizontal: 4,
+    marginHorizontal: 2,
+    justifyContent: 'center',
   },
   name: {
     fontSize: FontSizes.s2.size,

From dc0b95113672c64bf57fb5fffb41c54db7d5c2b2 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 21:41:57 -0400
Subject: [PATCH 044/291] Remove background color from Card component's image
 container

---
 src/components/Card.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index bbb9c9b..760b127 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -104,7 +104,6 @@ const styles = StyleSheet.create({
     maxWidth: '100%',
   },
   imageContainer: {
-    backgroundColor: Colors.secondaryGray,
     minHeight: 118,
     maxHeight: 118,
     maxWidth: 114,

From 7dc045190bd79fed0a373926b3e8617479b4e7e9 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 30 Mar 2025 21:46:45 -0400
Subject: [PATCH 045/291] Automatic login after register

---
 src/screens/RegisterScreen.tsx            |  5 +-
 src/screens/RegistrationSuccessScreen.tsx | 66 +++++++++++++++++------
 src/screens/tab/HomeScreen.tsx            | 39 +++++++++++++-
 3 files changed, 92 insertions(+), 18 deletions(-)

diff --git a/src/screens/RegisterScreen.tsx b/src/screens/RegisterScreen.tsx
index 9fd3397..c03e389 100644
--- a/src/screens/RegisterScreen.tsx
+++ b/src/screens/RegisterScreen.tsx
@@ -133,7 +133,10 @@ export default function RegisterScreen() {
       if (result.success) {
         setShowSuccessAlert(true);
         setTimeout(() => {
-          router.replace('/success');
+          router.replace({
+            pathname: '/success',
+            params: { email, password },
+          });
         }, 2000);
       } else {
         setShowErrorAlert(true);
diff --git a/src/screens/RegistrationSuccessScreen.tsx b/src/screens/RegistrationSuccessScreen.tsx
index d60d67d..d1d7e33 100644
--- a/src/screens/RegistrationSuccessScreen.tsx
+++ b/src/screens/RegistrationSuccessScreen.tsx
@@ -1,31 +1,65 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
-import { useRouter } from 'expo-router';
-import Button from '../components/Button';
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ActivityIndicator } from 'react-native';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { AuthService } from '../services/auth';
 import PoppinsText from '../components/PoppinsText';
+import Button from '../components/Button';
 import { Colors, FontSizes } from '../styles/theme';
 
 export default function RegistrationSuccessScreen() {
   const router = useRouter();
+  const { email, password } = useLocalSearchParams(); // Recibe las credenciales del registro
+  const [loading, setLoading] = useState(true);
+  const [loginSuccess, setLoginSuccess] = useState(false);
 
-  const handleContinue = () => {
-    router.replace('/(tabs)');
-  };
+  useEffect(() => {
+    const autoLogin = async () => {
+      if (email && password) {
+        const result = await AuthService.login(
+          email as string,
+          password as string,
+        );
+        if (result.success) {
+          setLoginSuccess(true); // Login exitoso
+        } else {
+          console.error(
+            'Error en el inicio de sesión automático:',
+            result.error,
+          );
+          router.replace('/login'); // Redirige al login manualmente
+        }
+      }
+      setLoading(false);
+    };
+
+    autoLogin();
+  }, [email, password, router]);
 
   return (
     <View style={styles.container}>
       <PoppinsText weight="semibold" style={styles.title}>
         Registro Exitoso!
       </PoppinsText>
-      <PoppinsText weight="regular" style={styles.message}>
-        Tu cuenta ha sido creada con éxito. ¡Bienvenido a PharmaTech!
-      </PoppinsText>
-      <Button
-        title="Continuar"
-        onPress={handleContinue}
-        style={styles.button}
-        size="large"
-      />
+      {loading ? (
+        <>
+          <PoppinsText weight="regular" style={styles.message}>
+            Estamos configurando tu cuenta. Por favor, espera un momento...
+          </PoppinsText>
+          <ActivityIndicator size="large" color={Colors.primary} />
+        </>
+      ) : loginSuccess ? (
+        <>
+          <PoppinsText weight="regular" style={styles.message}>
+            Tu cuenta está lista. Presiona el botón para continuar.
+          </PoppinsText>
+          <Button
+            title="Ir al Home"
+            size="medium"
+            onPress={() => router.replace('/(tabs)')}
+            style={styles.button}
+          />
+        </>
+      ) : null}
     </View>
   );
 }
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 75e8656..a6a7102 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,5 +1,7 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import { useRouter } from 'expo-router';
+import * as SecureStore from 'expo-secure-store';
 import { useCart } from '../../hooks/useCart';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors, FontSizes } from '../../styles/theme';
@@ -9,6 +11,8 @@ import { Product } from '../../types/Product';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState<Product[]>([]);
+  const [loading, setLoading] = useState(true);
+  const router = useRouter();
   const { cartItems, addToCart, updateCartQuantity } = useCart();
 
   const getItemQuantity = (productId: number) => {
@@ -49,9 +53,31 @@ export default function HomeScreen() {
   };
 
   useEffect(() => {
+    const checkAuthToken = async () => {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        router.replace('/login'); // Redirige al login si no hay token
+      } else {
+        console.log('JWT Token:', token); // Log del JWT
+        setLoading(false);
+      }
+    };
+
+    checkAuthToken();
     obtainProducts();
   }, [cartItems]);
 
+  if (loading) {
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+        <PoppinsText weight="regular" style={styles.loadingText}>
+          Verificando autenticación...
+        </PoppinsText>
+      </View>
+    );
+  }
+
   return (
     <View testID="home-screen" style={styles.container}>
       <ScrollView>
@@ -82,6 +108,17 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.bgColor,
     paddingLeft: 5,
   },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
+  loadingText: {
+    marginTop: 10,
+    fontSize: FontSizes.b1.size,
+    color: Colors.textLowContrast,
+  },
   title: {
     fontSize: FontSizes.s1.size,
     color: Colors.textMain,

From eb4b8187a753fb7c4b5fc206a448c339f6154dbc Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 21:51:00 -0400
Subject: [PATCH 046/291] Refactor inventory fetching logic in
 ProductDetailScreen for improved clarity and performance

---
 src/screens/ProductDetailScreen.tsx | 24 ++++++++++++++++--------
 1 file changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 4ce21ff..de5ec3e 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -137,7 +137,20 @@ const ProductDetailScreen: React.FC = () => {
             }),
           ),
         });
-        for (const p of product?.presentation || []) {
+
+        setCurrentPrice(productsData.data.presentation[0].price);
+      } else {
+        console.log(productsData.error);
+      }
+    };
+
+    obtainProducts();
+  }, []);
+
+  useEffect(() => {
+    const fetchInventory = async () => {
+      if (product?.presentation) {
+        for (const p of product.presentation) {
           const inventoryData = await InventoryService.getPresentationInventory(
             1,
             20,
@@ -167,15 +180,10 @@ const ProductDetailScreen: React.FC = () => {
             console.error(inventoryData.error);
           }
         }
-
-        setCurrentPrice(productsData.data.presentation[0].price);
-      } else {
-        console.log(productsData.error);
       }
     };
-
-    obtainProducts();
-  }, []);
+    fetchInventory();
+  }, [product]);
 
   const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
     const contentOffsetX = event.nativeEvent.contentOffset.x;

From 663d5f539bbc7b5641894e896afee34b04d8f793 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 22:00:00 -0400
Subject: [PATCH 047/291] Update navigation in ProductCard to use replace
 instead of push for better routing behavior

---
 src/components/Card.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 760b127..fddafb3 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -21,7 +21,7 @@ const ProductCard: React.FC<Product> = ({
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
   return (
-    <TouchableOpacity onPress={() => router.push('/products/' + id)}>
+    <TouchableOpacity onPress={() => router.replace('/products/' + id)}>
       <View style={styles.card}>
         <View
           style={{

From 2bcbb290a4f5ca2c51936cba3e1a39e18d990c91 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 30 Mar 2025 22:34:15 -0400
Subject: [PATCH 048/291] Update navigation in ProductCard to use push instead
 of replace for routing

---
 src/components/Card.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index fddafb3..760b127 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -21,7 +21,7 @@ const ProductCard: React.FC<Product> = ({
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
   return (
-    <TouchableOpacity onPress={() => router.replace('/products/' + id)}>
+    <TouchableOpacity onPress={() => router.push('/products/' + id)}>
       <View style={styles.card}>
         <View
           style={{

From ccf51d8a172f0eaef561e918572bf55b1a4ec28f Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 30 Mar 2025 22:50:11 -0400
Subject: [PATCH 049/291] Implement email verification modal and auto-redirect
 after registration

---
 src/screens/RegistrationSuccessScreen.tsx  |  9 +++++++-
 src/screens/tab/CategoriesScreen.tsx       | 13 -----------
 src/screens/tab/EmailVerificationModal.tsx |  5 +++-
 src/screens/tab/HomeScreen.tsx             | 27 +++++++++++++++++++---
 4 files changed, 36 insertions(+), 18 deletions(-)

diff --git a/src/screens/RegistrationSuccessScreen.tsx b/src/screens/RegistrationSuccessScreen.tsx
index d1d7e33..68d2594 100644
--- a/src/screens/RegistrationSuccessScreen.tsx
+++ b/src/screens/RegistrationSuccessScreen.tsx
@@ -12,6 +12,13 @@ export default function RegistrationSuccessScreen() {
   const [loading, setLoading] = useState(true);
   const [loginSuccess, setLoginSuccess] = useState(false);
 
+  const handleRedirectToHome = () => {
+    router.replace({
+      pathname: '/(tabs)',
+      params: { showEmailVerification: 'true' },
+    });
+  };
+
   useEffect(() => {
     const autoLogin = async () => {
       if (email && password) {
@@ -55,7 +62,7 @@ export default function RegistrationSuccessScreen() {
           <Button
             title="Ir al Home"
             size="medium"
-            onPress={() => router.replace('/(tabs)')}
+            onPress={handleRedirectToHome}
             style={styles.button}
           />
         </>
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index afe3c45..d9062f1 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -3,13 +3,11 @@ import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import Button from '../../components/Button';
 import { useRouter } from 'expo-router';
-import EmailVerificationModal from './EmailVerificationModal';
 import { Colors } from '../../styles/theme';
 import Popup from '../../components/Popup';
 import { AuthService } from '../../services/auth';
 
 export default function CategoriesScreen() {
-  const [isModalVisible, setIsModalVisible] = useState(false);
   const router = useRouter();
   const [showPopup, setShowPopup] = useState(false);
 
@@ -55,17 +53,6 @@ export default function CategoriesScreen() {
         mode="filled"
         size="large"
       />
-      <Button
-        title="Verificar correo"
-        onPress={() => setIsModalVisible(true)}
-        variant="primary"
-        mode="filled"
-        size="large"
-      />
-      <EmailVerificationModal
-        visible={isModalVisible}
-        onClose={() => setIsModalVisible(false)}
-      />
     </View>
   );
 }
diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index c354ad0..42dddb4 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -216,7 +216,7 @@ export default function EmailVerificationModal({
               />
             )}
           </View>
-          <Animated.View style={[styles.fadeAnim, { flex: 1 }]}>
+          <Animated.View style={[styles.fadeAnim, styles.flexContainer]}>
             <View style={styles.stepContainer}>
               <PoppinsText weight="medium" style={styles.stepTitle}>
                 Confirma tu correo electrónico
@@ -372,4 +372,7 @@ const styles = StyleSheet.create({
     textAlign: 'left',
     marginVertical: 8,
   },
+  flexContainer: {
+    flex: 1,
+  },
 });
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index a6a7102..b985648 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
-import { useRouter } from 'expo-router';
+import { useRouter, useLocalSearchParams } from 'expo-router'; // Importamos useLocalSearchParams
 import * as SecureStore from 'expo-secure-store';
 import { useCart } from '../../hooks/useCart';
 import PoppinsText from '../../components/PoppinsText';
@@ -8,11 +8,15 @@ import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
 import { ProductService } from '../../services/products';
 import { Product } from '../../types/Product';
+import EmailVerificationModal from './EmailVerificationModal';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState<Product[]>([]);
   const [loading, setLoading] = useState(true);
+  const [showEmailVerification, setShowEmailVerification] = useState(false);
   const router = useRouter();
+  const { showEmailVerification: showEmailVerificationParam } =
+    useLocalSearchParams();
   const { cartItems, addToCart, updateCartQuantity } = useCart();
 
   const getItemQuantity = (productId: number) => {
@@ -67,6 +71,15 @@ export default function HomeScreen() {
     obtainProducts();
   }, [cartItems]);
 
+  useEffect(() => {
+    if (showEmailVerificationParam) {
+      const timer = setTimeout(() => {
+        setShowEmailVerification(true);
+      }, 3000);
+      return () => clearTimeout(timer);
+    }
+  }, [showEmailVerificationParam]);
+
   if (loading) {
     return (
       <View style={styles.loadingContainer}>
@@ -85,7 +98,7 @@ export default function HomeScreen() {
           <PoppinsText weight="medium" style={styles.title}>
             Ofertas especiales
           </PoppinsText>
-          <View style={{ flexDirection: 'row', width: '100%' }}>
+          <View style={styles.rowFullWidth}>
             <Carousel cards={products} />
           </View>
         </View>
@@ -93,11 +106,15 @@ export default function HomeScreen() {
           <PoppinsText weight="medium" style={styles.title}>
             Medicamentos
           </PoppinsText>
-          <View style={{ flexDirection: 'row', width: '100%' }}>
+          <View style={styles.rowFullWidth}>
             <Carousel cards={products} />
           </View>
         </View>
       </ScrollView>
+      <EmailVerificationModal
+        visible={showEmailVerification}
+        onClose={() => setShowEmailVerification(false)}
+      />
     </View>
   );
 }
@@ -124,4 +141,8 @@ const styles = StyleSheet.create({
     color: Colors.textMain,
     paddingHorizontal: 15,
   },
+  rowFullWidth: {
+    flexDirection: 'row',
+    width: '100%',
+  },
 });

From b6d9cb375c9748ce5075278caa23e9a8c8898f90 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 30 Mar 2025 23:12:18 -0400
Subject: [PATCH 050/291] Fixing user active session

---
 src/app/_layout.tsx          | 24 ++++++++++++++++-------
 src/app/index.tsx            |  2 +-
 src/app/splash.tsx           |  2 ++
 src/screens/SplashScreen.tsx | 38 ++++++++++++++++++++++++++++++++++++
 src/services/auth.ts         | 17 ++++++++++++++++
 5 files changed, 75 insertions(+), 8 deletions(-)
 create mode 100644 src/app/splash.tsx
 create mode 100644 src/screens/SplashScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index bce89e3..1d7ff76 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -1,4 +1,4 @@
-import React, { useEffect } from 'react';
+import React, { useEffect, useState } from 'react';
 import {
   View,
   ActivityIndicator,
@@ -16,6 +16,7 @@ import { Stack } from 'expo-router/stack';
 import { ChevronLeftIcon, XMarkIcon } from 'react-native-heroicons/outline';
 import { Provider } from 'react-redux';
 import { store } from '../redux/store';
+import { Colors } from '../styles/theme';
 
 SplashScreen.preventAutoHideAsync();
 
@@ -26,16 +27,23 @@ export default function RootLayout() {
     Poppins_600SemiBold,
   });
 
+  const [isAppReady, setIsAppReady] = useState(false);
+
   useEffect(() => {
-    if (fontsLoaded) {
-      SplashScreen.hideAsync();
-    }
+    const prepareApp = async () => {
+      if (fontsLoaded) {
+        SplashScreen.hideAsync();
+        setIsAppReady(true); // Marca la app como lista
+      }
+    };
+
+    prepareApp();
   }, [fontsLoaded]);
 
-  if (!fontsLoaded) {
+  if (!isAppReady) {
     return (
       <View style={styles.loadingContainer}>
-        <ActivityIndicator size="large" />
+        <ActivityIndicator size="large" color={Colors.primary} />
       </View>
     );
   }
@@ -54,8 +62,10 @@ export default function RootLayout() {
           headerBackTitleVisible: false,
         })}
       >
-        <Stack.Screen name="index" redirect={true} />
+        {/* Cambia la pantalla inicial al SplashScreen personalizado */}
+        <Stack.Screen name="index" options={{ headerShown: false }} />
         <Stack.Screen name="login" options={{ headerShown: false }} />
+        <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
diff --git a/src/app/index.tsx b/src/app/index.tsx
index ef45edd..c644d4f 100644
--- a/src/app/index.tsx
+++ b/src/app/index.tsx
@@ -1,5 +1,5 @@
 import { Redirect } from 'expo-router';
 
 export default function Index() {
-  return <Redirect href="/login" />;
+  return <Redirect href="/splash" />;
 }
diff --git a/src/app/splash.tsx b/src/app/splash.tsx
new file mode 100644
index 0000000..d5011e5
--- /dev/null
+++ b/src/app/splash.tsx
@@ -0,0 +1,2 @@
+import SplashScreen from '../screens/SplashScreen';
+export default SplashScreen;
diff --git a/src/screens/SplashScreen.tsx b/src/screens/SplashScreen.tsx
new file mode 100644
index 0000000..f177c06
--- /dev/null
+++ b/src/screens/SplashScreen.tsx
@@ -0,0 +1,38 @@
+import React, { useEffect } from 'react';
+import { View, StyleSheet } from 'react-native';
+import { useRouter } from 'expo-router';
+import { AuthService } from '../services/auth';
+import { Colors } from '../styles/theme';
+
+export default function SplashScreen() {
+  const router = useRouter();
+
+  useEffect(() => {
+    const checkSession = async () => {
+      try {
+        const isValidSession = await AuthService.validateSession();
+        if (isValidSession) {
+          router.replace('/(tabs)');
+        } else {
+          router.replace('/login');
+        }
+      } catch (error) {
+        console.error('Error al validar la sesión:', error);
+        router.replace('/login'); // Redirige al login en caso de error
+      }
+    };
+
+    checkSession();
+  }, []);
+
+  return <View style={styles.container}></View>;
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
+});
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 4a77ba1..623857f 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -3,6 +3,7 @@ import * as SecureStore from 'expo-secure-store';
 import { ServiceResponse, UserGender, SignUpResponse } from '../types/api.d';
 import { validateEmail } from '../utils/validators';
 import { extractErrorMessage } from '../utils/errorHandler';
+import { decodeJWT } from '../helper/jwtHelper';
 
 export const AuthService = {
   login: async (email: string, password: string): Promise<ServiceResponse> => {
@@ -170,4 +171,20 @@ export const AuthService = {
       console.error('Error al cerrar sesión:', error);
     }
   },
+
+  validateSession: async (): Promise<boolean> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) return false;
+
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) return false;
+
+      console.log('Token válido. Usuario ID:', decoded.userId);
+      return true; // El token es válido
+    } catch (error) {
+      console.error('Error al validar la sesión:', error);
+      return false;
+    }
+  },
 };

From d1365282b599bebf5a8b818b375ccae6bbfd8b25 Mon Sep 17 00:00:00 2001
From: luiger <luiger852@gmail.com>
Date: Tue, 1 Apr 2025 00:52:25 -0400
Subject: [PATCH 051/291] badge2.0

---
 src/components/Badge.tsx | 34 +++++++++++++++++++++++-----------
 1 file changed, 23 insertions(+), 11 deletions(-)

diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index 36cd94a..f680d2e 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -1,36 +1,48 @@
 import React from 'react';
-import { View, Text, StyleSheet } from 'react-native';
+import { View, StyleSheet } from 'react-native';
+import PoppinsText from './PoppinsText';
 
 interface BadgeProps {
-  count?: number | string;
+  text?: string;
+  size?: 'small' | 'medium' | 'large';
 }
 
-const Badge: React.FC<BadgeProps> = ({ count }) => {
-  if (count === undefined || count === null) return null;
+const Badge: React.FC<BadgeProps> = ({ text, size = 'medium' }) => {
+  // Tamaños predefinidos
+  const sizes = {
+    small: { width: 8, height: 8, borderRadius: 4, fontSize: 0 }, // Punto sin texto
+    medium: { width: 16, height: 16, borderRadius: 8, fontSize: 10 },
+    large: { width: 31, height: 16, borderRadius: 8, fontSize: 12 },
+  };
+
+  const style = sizes[size];
 
   return (
-    <View style={styles.badge}>
-      <Text style={styles.text}>{count}</Text>
+    <View style={[styles.badge, style]}>
+      {text ? (
+        <PoppinsText
+          weight="semibold"
+          style={[styles.text, { fontSize: style.fontSize }]}
+        >
+          {text}
+        </PoppinsText>
+      ) : null}
     </View>
   );
 };
 
 const styles = StyleSheet.create({
   badge: {
-    width: 16,
-    height: 16,
-    borderRadius: 8, // Para que sea completamente circular
     backgroundColor: '#E10000',
     justifyContent: 'center',
     alignItems: 'center',
     position: 'absolute',
     top: -5,
     right: -5,
+    paddingHorizontal: 4, // Espaciado para textos largos
   },
   text: {
     color: '#FFFFFF',
-    fontSize: 10,
-    fontWeight: 'bold',
   },
 });
 

From 314f2a171b03cd1f5cec33b66941fec55b3fc97b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 12:40:50 -0400
Subject: [PATCH 052/291] Fixing badges

---
 src/components/Badge.tsx | 134 +++++++++++++++++++++++++++++++--------
 1 file changed, 106 insertions(+), 28 deletions(-)

diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index f680d2e..5cb507f 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -1,48 +1,126 @@
 import React from 'react';
-import { View, StyleSheet } from 'react-native';
-import PoppinsText from './PoppinsText';
+import {
+  View,
+  Text,
+  StyleSheet,
+  StyleProp,
+  ViewStyle,
+  TextStyle,
+} from 'react-native';
+import { Colors } from '../styles/theme';
 
-interface BadgeProps {
-  text?: string;
-  size?: 'small' | 'medium' | 'large';
+export interface BadgeProps {
+  variant: 'filled' | 'outlined' | 'text';
+  color: 'primary' | 'warning' | 'danger' | 'success' | 'info';
+  size: 'small' | 'medium' | 'large';
+  borderRadius?: 'rounded' | 'square';
+  children: React.ReactNode;
 }
 
-const Badge: React.FC<BadgeProps> = ({ text, size = 'medium' }) => {
-  // Tamaños predefinidos
-  const sizes = {
-    small: { width: 8, height: 8, borderRadius: 4, fontSize: 0 }, // Punto sin texto
-    medium: { width: 16, height: 16, borderRadius: 8, fontSize: 10 },
-    large: { width: 31, height: 16, borderRadius: 8, fontSize: 12 },
+const Badge: React.FC<BadgeProps> = ({
+  variant,
+  color,
+  size,
+  borderRadius = 'rounded',
+  children,
+}) => {
+  const sizeStyles: Record<string, StyleProp<ViewStyle | TextStyle>> = {
+    small: { paddingHorizontal: 8, paddingVertical: 4, fontSize: 12 },
+    medium: { paddingHorizontal: 12, paddingVertical: 6, fontSize: 14 },
+    large: { paddingHorizontal: 16, paddingVertical: 8, fontSize: 16 },
   };
 
-  const style = sizes[size];
+  const borderRadiusStyles: Record<string, StyleProp<ViewStyle>> = {
+    rounded: { borderRadius: 9999 },
+    square: { borderRadius: 4 },
+  };
+
+  const colorStyles: Record<
+    string,
+    Record<string, StyleProp<ViewStyle | TextStyle>>
+  > = {
+    filled: {
+      primary: { backgroundColor: Colors.primary, color: Colors.textWhite },
+      warning: {
+        backgroundColor: Colors.semanticWarning,
+        color: Colors.textWhite,
+      },
+      danger: {
+        backgroundColor: Colors.semanticDanger,
+        color: Colors.textWhite,
+      },
+      success: {
+        backgroundColor: Colors.semanticSuccess,
+        color: Colors.textWhite,
+      },
+      info: { backgroundColor: Colors.semanticInfo, color: Colors.textWhite },
+    },
+    outlined: {
+      primary: {
+        borderColor: Colors.primary,
+        borderWidth: 1,
+        color: Colors.primary,
+      },
+      warning: {
+        borderColor: Colors.semanticWarning,
+        borderWidth: 1,
+        color: Colors.semanticWarning,
+      },
+      danger: {
+        borderColor: Colors.semanticDanger,
+        borderWidth: 1,
+        color: Colors.semanticDanger,
+      },
+      success: {
+        borderColor: Colors.semanticSuccess,
+        borderWidth: 1,
+        color: Colors.semanticSuccess,
+      },
+      info: {
+        borderColor: Colors.semanticInfo,
+        borderWidth: 1,
+        color: Colors.semanticInfo,
+      },
+    },
+    text: {
+      primary: { color: Colors.primary },
+      warning: { color: Colors.semanticWarning },
+      danger: { color: Colors.semanticDanger },
+      success: { color: Colors.semanticSuccess },
+      info: { color: Colors.semanticInfo },
+    },
+  };
+
+  const variantStyle = colorStyles[variant][color];
+  const sizeStyle = sizeStyles[size];
+  const borderRadiusStyle = borderRadiusStyles[borderRadius];
 
   return (
-    <View style={[styles.badge, style]}>
-      {text ? (
-        <PoppinsText
-          weight="semibold"
-          style={[styles.text, { fontSize: style.fontSize }]}
-        >
-          {text}
-        </PoppinsText>
-      ) : null}
+    <View style={[styles.base, sizeStyle, borderRadiusStyle, variantStyle]}>
+      <Text
+        style={[
+          styles.text,
+          variant === 'outlined' || variant === 'text'
+            ? {
+                color:
+                  (variantStyle as TextStyle).borderColor || Colors.textWhite,
+              }
+            : { color: Colors.textWhite },
+        ]}
+      >
+        {children}
+      </Text>
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  badge: {
-    backgroundColor: '#E10000',
+  base: {
     justifyContent: 'center',
     alignItems: 'center',
-    position: 'absolute',
-    top: -5,
-    right: -5,
-    paddingHorizontal: 4, // Espaciado para textos largos
   },
   text: {
-    color: '#FFFFFF',
+    fontFamily: 'Poppins',
   },
 });
 

From 1e28de1df0db9b4cc0594c39622f4f680754c084 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 15:01:33 -0400
Subject: [PATCH 053/291] Moving sign out and change password

---
 src/components/TopBar.tsx            | 64 ++++++++++++++++++++++++++--
 src/screens/tab/CategoriesScreen.tsx | 48 +--------------------
 2 files changed, 61 insertions(+), 51 deletions(-)

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index 7d98cb2..72ea504 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -6,24 +6,40 @@ import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
 import { useRouter } from 'expo-router';
 import Avatar from './Avatar';
+import Popup from './Popup';
+import { AuthService } from '../services/auth';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
+  const [isPopupVisible, setIsPopupVisible] = useState(false);
+  const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
+    useState(false);
   const router = useRouter();
 
   const handleSearch = () => {
-    // Search logic
     console.log('Texto de búsqueda:', searchText);
   };
 
+  const handleLogout = async () => {
+    try {
+      await AuthService.logout(); // Llama al método logout del servicio de autenticación
+      setIsLogoutConfirmationVisible(false); // Cierra el popup de confirmación
+      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
+    } catch (error) {
+      console.error('Error al cerrar sesión:', error);
+    }
+  };
+
   return (
     <View style={styles.container}>
       {/* Upper section */}
       <View style={styles.topSection}>
         {/* Left user icon */}
-        <TouchableOpacity style={styles.iconButton}>
-          <Avatar />
-        </TouchableOpacity>
+        <View>
+          <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
+            <Avatar />
+          </TouchableOpacity>
+        </View>
 
         {/* Logo */}
         <View style={styles.logoContainer}>
@@ -48,6 +64,46 @@ const TopBar = () => {
         onSearchPress={handleSearch}
         style={styles.searchInput}
       />
+
+      {/* Popup for Avatar Options */}
+      <Popup
+        visible={isPopupVisible}
+        type="center"
+        headerText="Opciones"
+        bodyText="Selecciona una acción:"
+        primaryButton={{
+          text: 'Cambiar contraseña',
+          onPress: () => {
+            setIsPopupVisible(false);
+            router.push('/change-password');
+          },
+        }}
+        secondaryButton={{
+          text: 'Cerrar sesión',
+          onPress: () => {
+            setIsPopupVisible(false);
+            setIsLogoutConfirmationVisible(true); // Muestra el popup de confirmación
+          },
+        }}
+        onClose={() => setIsPopupVisible(false)}
+      />
+
+      {/* Popup for Logout Confirmation */}
+      <Popup
+        visible={isLogoutConfirmationVisible}
+        type="center"
+        headerText="Cerrar sesión"
+        bodyText="¿Estás seguro de que deseas cerrar sesión?"
+        primaryButton={{
+          text: 'Sí',
+          onPress: handleLogout,
+        }}
+        secondaryButton={{
+          text: 'No',
+          onPress: () => setIsLogoutConfirmationVisible(false),
+        }}
+        onClose={() => setIsLogoutConfirmationVisible(false)}
+      />
     </View>
   );
 };
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index d9062f1..cd7467f 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -1,58 +1,12 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
-import Button from '../../components/Button';
-import { useRouter } from 'expo-router';
 import { Colors } from '../../styles/theme';
-import Popup from '../../components/Popup';
-import { AuthService } from '../../services/auth';
 
 export default function CategoriesScreen() {
-  const router = useRouter();
-  const [showPopup, setShowPopup] = useState(false);
-
-  const handleLogout = async () => {
-    try {
-      await AuthService.logout(); // Llama al método logout del servicio de autenticación
-      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
-    } catch (error) {
-      console.error('Error al cerrar sesión:', error);
-    }
-  };
-
   return (
     <View style={styles.container}>
-      {/* Popup */}
-      <Popup
-        visible={showPopup}
-        type="center"
-        headerText="Cerrar sesión"
-        bodyText="¿Estás seguro de que deseas cerrar sesión?"
-        primaryButton={{
-          text: 'Sí',
-          onPress: handleLogout,
-        }}
-        secondaryButton={{
-          text: 'No',
-          onPress: () => setShowPopup(false),
-        }}
-        onClose={() => setShowPopup(false)}
-      />
       <PoppinsText>Pantalla Categorías</PoppinsText>
-      <Button
-        title="Cerrar sesión"
-        onPress={() => setShowPopup(true)}
-        variant="secondary"
-        mode="filled"
-        size="large"
-      />
-      <Button
-        title="Change password"
-        onPress={() => router.push('/change-password')}
-        variant="primary"
-        mode="filled"
-        size="large"
-      />
     </View>
   );
 }

From ce8f7e80ba01a0f2e44029e5959007f8278749fe Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 17:29:47 -0400
Subject: [PATCH 054/291] Refactoring validations

---
 src/components/Input.tsx             | 24 +++++-----
 src/screens/LoginScreen.tsx          | 28 ++++++-----
 src/screens/PasswordChangeScreen.tsx | 13 ++++--
 src/screens/RegisterScreen.tsx       | 69 ++++++++++++++++++++++++----
 src/utils/validators.ts              | 30 ++++++++++++
 5 files changed, 130 insertions(+), 34 deletions(-)

diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 5193d76..18ec500 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -8,6 +8,7 @@ import {
 } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
+import { validateEmail, validatePassword } from '../utils/validators';
 
 type FieldType = 'text' | 'number' | 'email' | 'password' | 'textarea';
 type BorderType = 'none' | 'default' | 'parcial' | 'double';
@@ -55,17 +56,27 @@ const Input: React.FC<InputProps> = ({
     setIvalue(value);
   }, [value]);
 
+  const handleValidation = (input: string, type: 'email' | 'password') => {
+    if (type === 'email') {
+      return validateEmail(input);
+    }
+    if (type === 'password') {
+      return validatePassword(input);
+    }
+    return false;
+  };
+
   const validateInput = (input: string) => {
     if (useDefaultValidation) {
       switch (fieldType) {
         case 'text':
           return input.length > 0;
         case 'email':
-          return validateEmail(input);
+          return handleValidation(input, 'email');
         case 'number':
           return !isNaN(Number(input));
         case 'password':
-          return validatePassword(input);
+          return handleValidation(input, 'password');
         default:
           return true;
       }
@@ -113,15 +124,6 @@ const Input: React.FC<InputProps> = ({
     }
   };
 
-  const validatePassword = (input: string) => {
-    return input.length >= 8;
-  };
-
-  const validateEmail = (input: string) => {
-    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
-    return emailRegex.test(input);
-  };
-
   const showPass = () => {
     setShowPassword(!showPassword);
   };
diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index 292dd92..515fe25 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -32,18 +32,24 @@ export default function LoginScreen() {
     if (loading) return;
 
     setLoading(true);
-    const result = await AuthService.login(email, password);
-    setLoading(false);
-
-    if (result.success) {
-      setShowSuccessAlert(true);
-      setTimeout(() => {
-        setShowSuccessAlert(false);
-        router.replace('/(tabs)');
-      }, 2000);
-    } else {
+    try {
+      const result = await AuthService.login(email, password);
+      if (result.success) {
+        setShowSuccessAlert(true);
+        setTimeout(() => {
+          setShowSuccessAlert(false);
+          router.replace('/(tabs)');
+        }, 2000);
+      } else {
+        setShowErrorAlert(true);
+        setErrorMessage('Error al iniciar sesión, verifica tus credenciales.');
+      }
+    } catch (error) {
+      console.error(error);
       setShowErrorAlert(true);
-      setErrorMessage(result.error);
+      setErrorMessage('Error al iniciar sesión, verifica tus credenciales.');
+    } finally {
+      setLoading(false);
     }
   };
 
diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index 7dd4752..48eea55 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -13,6 +13,11 @@ import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
 import { Colors, FontSizes } from '../styles/theme';
 import { AuthService } from '../services/auth';
+import {
+  validatePassword,
+  validatePasswordMatch,
+  validateRequiredFields,
+} from '../utils/validators';
 
 export default function ChangePasswordScreen() {
   const router = useRouter();
@@ -39,12 +44,14 @@ export default function ChangePasswordScreen() {
   const handleChangePassword = async () => {
     if (loading) return;
 
-    if (!currentPassword || !newPassword || !confirmPassword) {
+    if (
+      !validateRequiredFields([currentPassword, newPassword, confirmPassword])
+    ) {
       showAlert('error', 'Error', 'Todos los campos son obligatorios.');
       return;
     }
 
-    if (newPassword.length < 8) {
+    if (!validatePassword(newPassword)) {
       showAlert(
         'error',
         'Error',
@@ -53,7 +60,7 @@ export default function ChangePasswordScreen() {
       return;
     }
 
-    if (newPassword !== confirmPassword) {
+    if (!validatePasswordMatch(newPassword, confirmPassword)) {
       showAlert('error', 'Error', 'Las contraseñas no coinciden.');
       return;
     }
diff --git a/src/screens/RegisterScreen.tsx b/src/screens/RegisterScreen.tsx
index 9fd3397..500e17b 100644
--- a/src/screens/RegisterScreen.tsx
+++ b/src/screens/RegisterScreen.tsx
@@ -19,6 +19,13 @@ import DatePickerInput from '../components/DatePickerInput';
 import { ChevronLeftIcon } from 'react-native-heroicons/outline';
 import { AuthService } from '../services/auth';
 import Alert from '../components/Alerts';
+import {
+  validateEmail,
+  validatePassword,
+  validatePasswordMatch,
+  validateRequiredFields,
+  validateDateFormat,
+} from '../utils/validators';
 
 export default function RegisterScreen() {
   const router = useRouter();
@@ -84,17 +91,22 @@ export default function RegisterScreen() {
   };
 
   const handleNext = () => {
-    if (password.length < 8) {
+    if (!validateEmail(email)) {
+      setShowErrorAlert(true);
+      setErrorMessage('El correo ingresado no es válido');
+      return;
+    }
+    if (!validatePassword(password)) {
       setShowErrorAlert(true);
       setErrorMessage('La contraseña debe tener al menos 8 caracteres');
       return;
     }
-    if (!email || !password || !confirmPassword) {
+    if (!validateRequiredFields([email, password, confirmPassword])) {
       setShowErrorAlert(true);
       setErrorMessage('Por favor completa todos los campos.');
       return;
     }
-    if (password !== confirmPassword) {
+    if (!validatePasswordMatch(password, confirmPassword)) {
       setShowErrorAlert(true);
       setErrorMessage('Las contraseñas no coinciden.');
       return;
@@ -103,20 +115,59 @@ export default function RegisterScreen() {
   };
 
   const handleRegister = async () => {
-    if (!firstName || !lastName || !cedula || !phoneNumber || !dateOfBirth) {
+    if (
+      !validateRequiredFields([
+        firstName,
+        lastName,
+        cedula,
+        phoneNumber,
+        dateOfBirth,
+      ])
+    ) {
       setShowErrorAlert(true);
       setErrorMessage('Por favor completa todos los campos');
       return;
     }
 
-    // Date validation
-    const isValidDate = /^\d{4}-\d{2}-\d{2}$/.test(dateOfBirth);
-    if (!isValidDate) {
+    if (!validateDateFormat(dateOfBirth)) {
       setShowErrorAlert(true);
       setErrorMessage('Formato de fecha inválido (Use YYYY-MM-DD)');
       return;
     }
 
+    // Validar que el usuario tenga al menos 14 años
+    const birthDate = new Date(dateOfBirth);
+    const today = new Date();
+    let age = today.getFullYear() - birthDate.getFullYear();
+    const monthDiff = today.getMonth() - birthDate.getMonth();
+    if (
+      monthDiff < 0 ||
+      (monthDiff === 0 && today.getDate() < birthDate.getDate())
+    ) {
+      age--;
+    }
+    if (age < 14) {
+      setShowErrorAlert(true);
+      setErrorMessage('Debes tener al menos 14 años para registrarte');
+      return;
+    }
+
+    // Validar que la cédula no exceda los 10 caracteres
+    if (cedula.length > 10) {
+      setShowErrorAlert(true);
+      setErrorMessage('La cédula no puede exceder los 10 caracteres');
+      return;
+    }
+
+    // Validar que el teléfono tenga entre 8 y 15 caracteres
+    if (phoneNumber.length < 8 || phoneNumber.length > 15) {
+      setShowErrorAlert(true);
+      setErrorMessage(
+        'El número de teléfono debe tener entre 8 y 15 caracteres',
+      );
+      return;
+    }
+
     setLoading(true);
     try {
       const result = await AuthService.register(
@@ -137,12 +188,12 @@ export default function RegisterScreen() {
         }, 2000);
       } else {
         setShowErrorAlert(true);
-        setErrorMessage(result.error);
+        setErrorMessage('Error al crear la cuenta, intenta de nuevo');
       }
     } catch (error) {
       console.error(error);
       setShowErrorAlert(true);
-      setErrorMessage('Error al crear la cuenta');
+      setErrorMessage('Error al crear la cuenta, intenta de nuevo');
     } finally {
       setLoading(false);
     }
diff --git a/src/utils/validators.ts b/src/utils/validators.ts
index 86b014a..4067fc4 100644
--- a/src/utils/validators.ts
+++ b/src/utils/validators.ts
@@ -1,4 +1,34 @@
+// Validación de correo electrónico
 export const validateEmail = (email: string): boolean => {
   const re = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
   return re.test(email);
 };
+
+// Validación de contraseña (mínimo 8 caracteres)
+export const validatePassword = (password: string): boolean => {
+  return password.length >= 8;
+};
+
+// Validación de coincidencia de contraseñas
+export const validatePasswordMatch = (
+  password: string,
+  confirmPassword: string,
+): boolean => {
+  return password === confirmPassword;
+};
+
+// Validación de campos vacíos
+export const validateRequiredFields = (fields: string[]): boolean => {
+  return fields.every((field) => field.trim() !== '');
+};
+
+// Validación de formato de fecha (YYYY-MM-DD)
+export const validateDateFormat = (date: string): boolean => {
+  const dateRegex = /^\d{4}-\d{2}-\d{2}$/;
+  return dateRegex.test(date);
+};
+
+// Validación de longitud del teléfono celular
+export const validatePhoneNumberLength = (phoneNumber: string): boolean => {
+  return phoneNumber.length >= 8 && phoneNumber.length <= 15;
+};

From e119c982869595f09c3f99bd242dcc176892ba1f Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 18:29:56 -0400
Subject: [PATCH 055/291] Adding change password route because it was deleted

---
 src/app/change-password.tsx | 2 ++
 1 file changed, 2 insertions(+)
 create mode 100644 src/app/change-password.tsx

diff --git a/src/app/change-password.tsx b/src/app/change-password.tsx
new file mode 100644
index 0000000..e14c711
--- /dev/null
+++ b/src/app/change-password.tsx
@@ -0,0 +1,2 @@
+import ChangePasswordScreen from '../screens/PasswordChangeScreen';
+export default ChangePasswordScreen;

From 9316df6da23e4ae7c74fc90bf1b86be0d97262b6 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 19:33:16 -0400
Subject: [PATCH 056/291] change

---
 src/screens/tab/CategoriesScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index d9062f1..350a099 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -38,7 +38,7 @@ export default function CategoriesScreen() {
         }}
         onClose={() => setShowPopup(false)}
       />
-      <PoppinsText>Pantalla Categorías</PoppinsText>
+      <PoppinsText>Pantalla Categorías some change</PoppinsText>
       <Button
         title="Cerrar sesión"
         onPress={() => setShowPopup(true)}

From 100d1c3b04c0e89aa97e4e348525611287b8b459 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 20:15:03 -0400
Subject: [PATCH 057/291] fixes

---
 src/app/_layout.tsx          | 2 +-
 src/app/products/_layout.tsx | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 330a655..19fdc7b 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -67,7 +67,7 @@ export default function RootLayout() {
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="products/[id]" options={{ headerShown: false }} />
+        <Stack.Screen name="products" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/products/_layout.tsx b/src/app/products/_layout.tsx
index e69de29..5bf1ded 100644
--- a/src/app/products/_layout.tsx
+++ b/src/app/products/_layout.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function ProductsLayout() {
+  return <Stack />;
+}

From 70952e777348a9b296bbae10f4bd7cc646dbf0f6 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 20:29:57 -0400
Subject: [PATCH 058/291] Eliminating expo header

---
 src/app/products/_layout.tsx | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/app/products/_layout.tsx b/src/app/products/_layout.tsx
index 5bf1ded..04160e7 100644
--- a/src/app/products/_layout.tsx
+++ b/src/app/products/_layout.tsx
@@ -2,5 +2,11 @@ import React from 'react';
 import { Stack } from 'expo-router';
 
 export default function ProductsLayout() {
-  return <Stack />;
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
 }

From e26c1dd1cf75d3a382321374769589c2f02a754d Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 1 Apr 2025 20:58:59 -0400
Subject: [PATCH 059/291] Update app.json to replace icon and splash image with
 PharmaTech branding

---
 app.json                              |  12 ++++++------
 src/assets/images/PharmaTech-icon.png | Bin 0 -> 83255 bytes
 2 files changed, 6 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/images/PharmaTech-icon.png

diff --git a/app.json b/app.json
index 5add738..71ba833 100644
--- a/app.json
+++ b/app.json
@@ -5,27 +5,27 @@
     "scheme": "pharmatech",
     "version": "0.2.0",
     "orientation": "portrait",
-    "icon": "./src/assets/images/icon.png",
+    "icon": "./src/assets/images/PharmaTech-icon.png",
     "userInterfaceStyle": "light",
     "newArchEnabled": true,
     "splash": {
-      "image": "src/assets/images/splash-icon.png",
+      "image": "src/assets/images/PharmaTech-icon.png",
       "resizeMode": "contain",
-      "backgroundColor": "#ffffff"
+      "backgroundColor": "#1C2143"
     },
     "ios": {
       "supportsTablet": true
     },
     "android": {
       "adaptiveIcon": {
-        "foregroundImage": "./src/assets/images/icon.png",
-        "backgroundColor": "#ffffff"
+        "foregroundImage": "./src/assets/images/PharmaTech-icon.png",
+        "backgroundColor": "#1C2143"
       },
       "package": "com.pharmatech.pharmatech"
     },
     "web": {
       "bundler": "metro",
-      "favicon": "./src/assets/images/icon.png"
+      "favicon": "./src/assets/images/PharmaTech-icon.png"
     },
     "extra": {
       "router": {
diff --git a/src/assets/images/PharmaTech-icon.png b/src/assets/images/PharmaTech-icon.png
new file mode 100644
index 0000000000000000000000000000000000000000..2afdb37258a8612298cb92500095240fc5af1924
GIT binary patch
literal 83255
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

literal 0
HcmV?d00001


From 420de4c05336396b2e33f1937539b312ca36652b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 21:05:56 -0400
Subject: [PATCH 060/291] Syncing cart with userId

---
 src/hooks/useCart.ts           |  8 ++++++++
 src/redux/slices/cartSlice.ts  | 11 ++++++++++-
 src/screens/tab/HomeScreen.tsx |  7 ++++++-
 src/services/auth.ts           |  7 +++++++
 4 files changed, 31 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useCart.ts b/src/hooks/useCart.ts
index 970c727..05eae89 100644
--- a/src/hooks/useCart.ts
+++ b/src/hooks/useCart.ts
@@ -5,12 +5,14 @@ import {
   removeItem,
   updateQuantity,
   CartItem,
+  setUserId,
 } from '../redux/slices/cartSlice';
 
 export const useCart = () => {
   const dispatch = useDispatch();
   const cartItems = useSelector((state: RootState) => state.cart.items);
   const total = useSelector((state: RootState) => state.cart.total);
+  const userId = useSelector((state: RootState) => state.cart.userId);
 
   const addToCart = (item: CartItem) => {
     dispatch(addItem(item));
@@ -29,12 +31,18 @@ export const useCart = () => {
     return item ? item.quantity : 0;
   };
 
+  const setCartUserId = (id: string | null) => {
+    dispatch(setUserId(id));
+  };
+
   return {
     cartItems,
     total,
+    userId,
     addToCart,
     removeFromCart,
     updateCartQuantity,
     getItemQuantity,
+    setCartUserId,
   };
 };
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index bd2ac70..26183bc 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -9,11 +9,13 @@ export type CartItem = {
 };
 
 type CartState = {
+  userId: string | null;
   items: CartItem[];
   total: number;
 };
 
 const initialState: CartState = {
+  userId: null,
   items: [],
   total: 0,
 };
@@ -25,6 +27,13 @@ const cartSlice = createSlice({
   name: 'cart',
   initialState,
   reducers: {
+    setUserId: (state, action: PayloadAction<string | null>) => {
+      state.userId = action.payload;
+      if (!action.payload) {
+        state.items = [];
+        state.total = 0;
+      }
+    },
     addItem: (state, action: PayloadAction<CartItem>) => {
       const existingItem = state.items.find(
         (item) => item.id === action.payload.id,
@@ -57,6 +66,6 @@ const cartSlice = createSlice({
   },
 });
 
-export const { addItem, removeItem, updateQuantity, clearCart } =
+export const { setUserId, addItem, removeItem, updateQuantity, clearCart } =
   cartSlice.actions;
 export default cartSlice.reducer;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index b985648..43a0f5a 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -9,6 +9,7 @@ import Carousel from '../../components/Carousel';
 import { ProductService } from '../../services/products';
 import { Product } from '../../types/Product';
 import EmailVerificationModal from './EmailVerificationModal';
+import { decodeJWT } from '../../helper/jwtHelper';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState<Product[]>([]);
@@ -17,7 +18,7 @@ export default function HomeScreen() {
   const router = useRouter();
   const { showEmailVerification: showEmailVerificationParam } =
     useLocalSearchParams();
-  const { cartItems, addToCart, updateCartQuantity } = useCart();
+  const { cartItems, addToCart, updateCartQuantity, setCartUserId } = useCart();
 
   const getItemQuantity = (productId: number) => {
     const cartItem = cartItems.find((item) => item.id === productId.toString());
@@ -63,6 +64,10 @@ export default function HomeScreen() {
         router.replace('/login'); // Redirige al login si no hay token
       } else {
         console.log('JWT Token:', token); // Log del JWT
+        const decoded = decodeJWT(token);
+        if (decoded?.userId) {
+          setCartUserId(decoded.userId); // Set the userId in the cart
+        }
         setLoading(false);
       }
     };
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 9456c30..52edefc 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -4,6 +4,8 @@ import { ServiceResponse, UserGender, SignUpResponse } from '../types/api.d';
 import { validateEmail } from '../utils/validators';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
+import { store } from '../redux/store';
+import { setUserId } from '../redux/slices/cartSlice';
 
 export const AuthService = {
   login: async (email: string, password: string): Promise<ServiceResponse> => {
@@ -22,6 +24,9 @@ export const AuthService = {
 
       await SecureStore.deleteItemAsync('user_data');
 
+      const decoded = decodeJWT(accessToken);
+      store.dispatch(setUserId(decoded?.userId || null));
+
       return { success: true, data: undefined };
     } catch (error) {
       return {
@@ -167,6 +172,8 @@ export const AuthService = {
       // Eliminar los interceptores configurados en el cliente HTTP
       const interceptors = api.client['client'].interceptors.request;
       interceptors.handlers = []; // Limpia todos los interceptores configurados
+
+      store.dispatch(setUserId(null)); // Limpia el carrito al cerrar sesión
     } catch (error) {
       console.error('Error al cerrar sesión:', error);
     }

From 99ea2b5149913e5f8089564084713becfce079f0 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 21:41:07 -0400
Subject: [PATCH 061/291] Putting badge to cart icon

---
 src/components/Badge.tsx  | 22 ++++++++++++++--------
 src/components/TopBar.tsx | 24 +++++++++++++++++++++++-
 2 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index 5cb507f..7089c1c 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -1,18 +1,18 @@
 import React from 'react';
 import {
   View,
-  Text,
   StyleSheet,
   StyleProp,
   ViewStyle,
   TextStyle,
 } from 'react-native';
 import { Colors } from '../styles/theme';
+import PoppinsText from './PoppinsText';
 
 export interface BadgeProps {
   variant: 'filled' | 'outlined' | 'text';
   color: 'primary' | 'warning' | 'danger' | 'success' | 'info';
-  size: 'small' | 'medium' | 'large';
+  size: 'tiny' | 'small' | 'medium' | 'large';
   borderRadius?: 'rounded' | 'square';
   children: React.ReactNode;
 }
@@ -25,9 +25,10 @@ const Badge: React.FC<BadgeProps> = ({
   children,
 }) => {
   const sizeStyles: Record<string, StyleProp<ViewStyle | TextStyle>> = {
-    small: { paddingHorizontal: 8, paddingVertical: 4, fontSize: 12 },
-    medium: { paddingHorizontal: 12, paddingVertical: 6, fontSize: 14 },
-    large: { paddingHorizontal: 16, paddingVertical: 8, fontSize: 16 },
+    tiny: { width: 17, height: 17, fontSize: 10 }, // Fixed width and height for a perfect circle
+    small: { width: 24, height: 24, fontSize: 12 },
+    medium: { width: 32, height: 32, fontSize: 14 },
+    large: { width: 40, height: 40, fontSize: 16 },
   };
 
   const borderRadiusStyles: Record<string, StyleProp<ViewStyle>> = {
@@ -97,7 +98,7 @@ const Badge: React.FC<BadgeProps> = ({
 
   return (
     <View style={[styles.base, sizeStyle, borderRadiusStyle, variantStyle]}>
-      <Text
+      <PoppinsText
         style={[
           styles.text,
           variant === 'outlined' || variant === 'text'
@@ -107,9 +108,11 @@ const Badge: React.FC<BadgeProps> = ({
               }
             : { color: Colors.textWhite },
         ]}
+        numberOfLines={1} // Ensures the text does not wrap
+        ellipsizeMode="clip" // Prevents truncation
       >
         {children}
-      </Text>
+      </PoppinsText>
     </View>
   );
 };
@@ -120,7 +123,10 @@ const styles = StyleSheet.create({
     alignItems: 'center',
   },
   text: {
-    fontFamily: 'Poppins',
+    textAlign: 'center',
+    marginTop: 1.5,
+    lineHeight: 16, // Matches the height for vertical centering
+    fontSize: 10, // Matches the font size for the "tiny" size
   },
 });
 
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index 72ea504..e100df7 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -8,6 +8,8 @@ import { useRouter } from 'expo-router';
 import Avatar from './Avatar';
 import Popup from './Popup';
 import { AuthService } from '../services/auth';
+import Badge from './Badge';
+import { useCart } from '../hooks/useCart';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
@@ -15,6 +17,13 @@ const TopBar = () => {
   const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
     useState(false);
   const router = useRouter();
+  const { cartItems } = useCart();
+
+  // Calculate the total quantity of items in the cart
+  const totalCartQuantity = cartItems.reduce(
+    (sum, item) => sum + item.quantity,
+    0,
+  );
 
   const handleSearch = () => {
     console.log('Texto de búsqueda:', searchText);
@@ -46,7 +55,7 @@ const TopBar = () => {
           <Logo width={118} height={48} />
         </View>
 
-        {/* Right cart icon */}
+        {/* Right cart icon with badge */}
         <TouchableOpacity
           style={styles.iconButton}
           onPress={() => {
@@ -54,6 +63,13 @@ const TopBar = () => {
           }}
         >
           <ShoppingCartIcon size={26} color={Colors.textMain} />
+          {totalCartQuantity > 0 && (
+            <View style={styles.badgeContainer}>
+              <Badge variant="filled" color="primary" size="tiny">
+                {totalCartQuantity}
+              </Badge>
+            </View>
+          )}
         </TouchableOpacity>
       </View>
 
@@ -128,6 +144,12 @@ const styles = StyleSheet.create({
   },
   iconButton: {
     paddingRight: 4,
+    position: 'relative',
+  },
+  badgeContainer: {
+    position: 'absolute',
+    top: -5,
+    right: -5,
   },
   searchInput: {
     backgroundColor: Colors.menuWhite,

From 0c163ae47838ab5b1f8ca492a7f4051fd960c980 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 1 Apr 2025 21:58:05 -0400
Subject: [PATCH 062/291] Small fix in product details

---
 src/screens/ProductDetailScreen.tsx | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index de5ec3e..aa331d1 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -365,7 +365,7 @@ const ProductDetailScreen: React.FC = () => {
               />
             </View>
             <View style={styles.availableContainer}>
-              {inventory &&
+              {inventory && inventory.length > 0 ? (
                 inventory.map((inv) => (
                   <View key={inv.id} style={styles.availableCard}>
                     <View style={{ padding: 10, paddingHorizontal: 16 }}>
@@ -411,7 +411,18 @@ const ProductDetailScreen: React.FC = () => {
                       </PoppinsText>
                     </View>
                   </View>
-                ))}
+                ))
+              ) : (
+                <PoppinsText
+                  style={{
+                    textAlign: 'center',
+                    color: Colors.textLowContrast,
+                    marginVertical: 10,
+                  }}
+                >
+                  No hay productos disponibles
+                </PoppinsText>
+              )}
             </View>
             <PoppinsText style={styles.sectionTitle}>
               Productos relacionados

From b8ea392e0929fc848d23d2851b622434de083894 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 4 Apr 2025 14:17:47 -0400
Subject: [PATCH 063/291] Alert fixes

---
 src/components/Alerts.tsx                  |  16 ++-
 src/screens/LoginScreen.tsx                | 156 +++++++++++----------
 src/screens/RegisterScreen.tsx             |   4 +
 src/screens/tab/EmailVerificationModal.tsx |  15 +-
 4 files changed, 106 insertions(+), 85 deletions(-)

diff --git a/src/components/Alerts.tsx b/src/components/Alerts.tsx
index 758bf0a..440cad0 100644
--- a/src/components/Alerts.tsx
+++ b/src/components/Alerts.tsx
@@ -22,6 +22,8 @@ interface AlertProps {
   onClose?: () => void;
 }
 
+let activeAlertClose: (() => void) | null = null;
+
 const Alert: React.FC<AlertProps> = ({
   title,
   message,
@@ -62,6 +64,12 @@ const Alert: React.FC<AlertProps> = ({
   const opacity = useRef(new Animated.Value(0)).current;
 
   useEffect(() => {
+    // Close any active alert before showing a new one
+    if (activeAlertClose) {
+      activeAlertClose();
+    }
+    activeAlertClose = handleClose;
+
     Animated.parallel([
       Animated.timing(translateY, {
         toValue: 0,
@@ -73,6 +81,12 @@ const Alert: React.FC<AlertProps> = ({
         useNativeDriver: true,
       }),
     ]).start();
+
+    return () => {
+      if (activeAlertClose === handleClose) {
+        activeAlertClose = null;
+      }
+    };
   }, []);
 
   const handleClose = () => {
@@ -88,7 +102,7 @@ const Alert: React.FC<AlertProps> = ({
         useNativeDriver: true,
       }),
     ]).start(() => {
-      onClose?.();
+      if (onClose) onClose();
     });
   };
 
diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index 515fe25..cbe2a5f 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -69,10 +69,7 @@ export default function LoginScreen() {
   return (
     <KeyboardAvoidingView style={{ flex: 1 }} behavior="height">
       <TouchableWithoutFeedback onPress={Keyboard.dismiss}>
-        <ScrollView
-          contentContainerStyle={styles.container}
-          keyboardShouldPersistTaps="handled"
-        >
+        <View style={{ flex: 1 }}>
           {/* Alerts */}
           <View style={styles.alertContainer}>
             {showErrorAlert && (
@@ -94,80 +91,86 @@ export default function LoginScreen() {
               />
             )}
           </View>
-          {/* Logo */}
-          <Logo style={styles.logo} />
-          {/* Titles */}
-          <PoppinsText weight="medium" style={styles.title}>
-            Bienvenido
-          </PoppinsText>
-          <PoppinsText weight="regular" style={styles.subtitle}>
-            Por favor introduce tus datos para iniciar sesión
-          </PoppinsText>
-          {/* Inputs */}
-          <View style={styles.inputsContainer}>
-            <Input
-              label="Correo electrónico"
-              placeholder="Ingresa tu correo electrónico"
-              value={email}
-              fieldType="email"
-              getValue={setEmail}
-              backgroundColor={Colors.menuWhite}
-              errorText="El correo ingresado no es válido"
-            />
-            <Input
-              label="Contraseña"
-              placeholder="Ingresa tu contraseña"
-              value={password}
-              fieldType="password"
-              getValue={setPassword}
-              backgroundColor={Colors.menuWhite}
-              errorText="La contraseña debe tener al menos 8 caracteres"
-            />
-          </View>
-          {/* Forgot my password */}
-          <TouchableOpacity
-            onPress={handleRecoverPassword}
-            style={styles.linkContainer}
+          {/* Scrollable content */}
+          <ScrollView
+            contentContainerStyle={styles.container}
+            keyboardShouldPersistTaps="handled"
           >
-            <PoppinsText weight="regular" style={styles.linkText}>
-              ¿Olvidaste tu contraseña?
+            {/* Logo */}
+            <Logo style={styles.logo} />
+            {/* Titles */}
+            <PoppinsText weight="medium" style={styles.title}>
+              Bienvenido
             </PoppinsText>
-          </TouchableOpacity>
-          {/* Login button */}
-          <Button
-            title="Iniciar sesión"
-            onPress={handleLogin}
-            style={styles.loginButton}
-            size="medium"
-            loading={loading}
-          />
-          {/* Google button */}
-          <TouchableOpacity
-            style={styles.googleButton}
-            onPress={handleGoogleLogin}
-          >
-            <Image
-              source={GoogleLogo}
-              style={styles.googleIcon}
-              resizeMode="contain"
-            />
-            <PoppinsText weight="medium" style={styles.googleButtonText}>
-              Iniciar sesión con Google
+            <PoppinsText weight="regular" style={styles.subtitle}>
+              Por favor introduce tus datos para iniciar sesión
             </PoppinsText>
-          </TouchableOpacity>
-          {/* Register link */}
-          <TouchableOpacity
-            onPress={handleRegister}
-            style={styles.registerContainer}
-          >
-            <PoppinsText weight="regular" style={styles.registerText}>
-              ¿No tienes cuenta?{' '}
-              <PoppinsText weight="regular" style={styles.registerLink}>
-                Regístrate
+            {/* Inputs */}
+            <View style={styles.inputsContainer}>
+              <Input
+                label="Correo electrónico"
+                placeholder="Ingresa tu correo electrónico"
+                value={email}
+                fieldType="email"
+                getValue={setEmail}
+                backgroundColor={Colors.menuWhite}
+                errorText="El correo ingresado no es válido"
+              />
+              <Input
+                label="Contraseña"
+                placeholder="Ingresa tu contraseña"
+                value={password}
+                fieldType="password"
+                getValue={setPassword}
+                backgroundColor={Colors.menuWhite}
+                errorText="La contraseña debe tener al menos 8 caracteres"
+              />
+            </View>
+            {/* Forgot my password */}
+            <TouchableOpacity
+              onPress={handleRecoverPassword}
+              style={styles.linkContainer}
+            >
+              <PoppinsText weight="regular" style={styles.linkText}>
+                ¿Olvidaste tu contraseña?
               </PoppinsText>
-            </PoppinsText>
-          </TouchableOpacity>
-        </ScrollView>
+            </TouchableOpacity>
+            {/* Login button */}
+            <Button
+              title="Iniciar sesión"
+              onPress={handleLogin}
+              style={styles.loginButton}
+              size="medium"
+              loading={loading}
+            />
+            {/* Google button */}
+            <TouchableOpacity
+              style={styles.googleButton}
+              onPress={handleGoogleLogin}
+            >
+              <Image
+                source={GoogleLogo}
+                style={styles.googleIcon}
+                resizeMode="contain"
+              />
+              <PoppinsText weight="medium" style={styles.googleButtonText}>
+                Iniciar sesión con Google
+              </PoppinsText>
+            </TouchableOpacity>
+            {/* Register link */}
+            <TouchableOpacity
+              onPress={handleRegister}
+              style={styles.registerContainer}
+            >
+              <PoppinsText weight="regular" style={styles.registerText}>
+                ¿No tienes cuenta?{' '}
+                <PoppinsText weight="regular" style={styles.registerLink}>
+                  Regístrate
+                </PoppinsText>
+              </PoppinsText>
+            </TouchableOpacity>
+          </ScrollView>
+        </View>
       </TouchableWithoutFeedback>
     </KeyboardAvoidingView>
   );
@@ -184,10 +187,11 @@ const styles = StyleSheet.create({
   },
   alertContainer: {
     position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -163,
     top: 20,
-    width: '100%',
     zIndex: 1000,
-    alignItems: 'center',
   },
   logo: {
     width: 192,
diff --git a/src/screens/RegisterScreen.tsx b/src/screens/RegisterScreen.tsx
index 97ddc75..9b0d335 100644
--- a/src/screens/RegisterScreen.tsx
+++ b/src/screens/RegisterScreen.tsx
@@ -76,6 +76,10 @@ export default function RegisterScreen() {
   }, [currentStep]);
 
   const handleStepChange = (newStep: number) => {
+    // Clear alerts when changing steps
+    setShowErrorAlert(false);
+    setErrorMessage('');
+
     Animated.timing(fadeAnim, {
       toValue: 0,
       duration: 200,
diff --git a/src/screens/tab/EmailVerificationModal.tsx b/src/screens/tab/EmailVerificationModal.tsx
index 42dddb4..59688c2 100644
--- a/src/screens/tab/EmailVerificationModal.tsx
+++ b/src/screens/tab/EmailVerificationModal.tsx
@@ -288,20 +288,19 @@ const styles = StyleSheet.create({
     height: 24,
     color: Colors.textMain,
   },
-  stepContainer: {
-    width: '100%',
-    marginVertical: 21,
-    marginTop: 70,
-  },
   alertsContainer: {
     position: 'absolute',
-    width: 326,
-    left: '50%',
-    marginLeft: -162,
     top: 20,
+    left: 0,
     right: 0,
+    alignItems: 'center',
     zIndex: 1000,
   },
+  stepContainer: {
+    width: '100%',
+    marginVertical: 21,
+    marginTop: 70,
+  },
   stepTitle: {
     fontSize: FontSizes.h3.size,
     lineHeight: FontSizes.h3.lineHeight,

From ce1dfb68b96ca0137e513141207318f61a1ef8da Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 4 Apr 2025 17:04:04 -0400
Subject: [PATCH 064/291] Configuring google maps integration

---
 app.json                            |  7 +++-
 package-lock.json                   | 29 +++++++++++++++
 package.json                        |  3 +-
 src/components/MapViewComponent.tsx | 56 +++++++++++++++++++++++++++++
 src/screens/tab/BranchesScreen.tsx  | 16 +++++++--
 5 files changed, 107 insertions(+), 4 deletions(-)
 create mode 100644 src/components/MapViewComponent.tsx

diff --git a/app.json b/app.json
index 71ba833..1cef0db 100644
--- a/app.json
+++ b/app.json
@@ -21,7 +21,12 @@
         "foregroundImage": "./src/assets/images/PharmaTech-icon.png",
         "backgroundColor": "#1C2143"
       },
-      "package": "com.pharmatech.pharmatech"
+      "package": "com.pharmatech.pharmatech",
+      "config": {
+        "googleMaps": {
+          "apiKey": "AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU"
+        }
+      }
     },
     "web": {
       "bundler": "metro",
diff --git a/package-lock.json b/package-lock.json
index 173f644..c416856 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -29,6 +29,7 @@
         "react-native": "0.76.7",
         "react-native-calendars": "^1.1310.0",
         "react-native-heroicons": "^4.0.0",
+        "react-native-maps": "1.18.0",
         "react-native-pager-view": "^6.7.0",
         "react-native-reanimated": "^3.16.2",
         "react-native-safe-area-context": "4.12.0",
@@ -4690,6 +4691,12 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
+    "node_modules/@types/geojson": {
+      "version": "7946.0.16",
+      "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
+      "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
+      "license": "MIT"
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -14234,6 +14241,28 @@
         "react-native": ">=0.73.0"
       }
     },
+    "node_modules/react-native-maps": {
+      "version": "1.18.0",
+      "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.18.0.tgz",
+      "integrity": "sha512-S17nYUqeMptgIPaAZuVRo+eRelPreBBYQWw6jsxU7qQ12p+THSfFaqabcNn7fBmsXhT3T27iIl8ek8v1H8BaGw==",
+      "license": "MIT",
+      "dependencies": {
+        "@types/geojson": "^7946.0.13"
+      },
+      "engines": {
+        "node": ">=18"
+      },
+      "peerDependencies": {
+        "react": ">= 17.0.1",
+        "react-native": ">= 0.64.3",
+        "react-native-web": ">= 0.11"
+      },
+      "peerDependenciesMeta": {
+        "react-native-web": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/react-native-pager-view": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.7.0.tgz",
diff --git a/package.json b/package.json
index fd3f6e8..e164808 100644
--- a/package.json
+++ b/package.json
@@ -45,7 +45,8 @@
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17"
+    "tailwindcss": "^3.4.17",
+    "react-native-maps": "1.18.0"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/components/MapViewComponent.tsx b/src/components/MapViewComponent.tsx
new file mode 100644
index 0000000..3fbc858
--- /dev/null
+++ b/src/components/MapViewComponent.tsx
@@ -0,0 +1,56 @@
+import React from 'react';
+import { StyleSheet, View } from 'react-native';
+import MapView, { Marker, PROVIDER_GOOGLE } from 'react-native-maps';
+
+type MapViewComponentProps = {
+  initialRegion: {
+    latitude: number;
+    longitude: number;
+    latitudeDelta: number;
+    longitudeDelta: number;
+  };
+  markers?: {
+    latitude: number;
+    longitude: number;
+    title?: string;
+    description?: string;
+  }[];
+};
+
+const MapViewComponent: React.FC<MapViewComponentProps> = ({
+  initialRegion,
+  markers = [],
+}) => {
+  return (
+    <View style={styles.container}>
+      <MapView
+        provider={PROVIDER_GOOGLE}
+        style={styles.map}
+        initialRegion={initialRegion}
+      >
+        {markers.map((marker, index) => (
+          <Marker
+            key={index}
+            coordinate={{
+              latitude: marker.latitude,
+              longitude: marker.longitude,
+            }}
+            title={marker.title}
+            description={marker.description}
+          />
+        ))}
+      </MapView>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+});
+
+export default MapViewComponent;
diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index bc40068..b872621 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -2,11 +2,22 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
+import MapViewComponent from '../../components/MapViewComponent';
 
 export default function BranchesScreen() {
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Sucursales</PoppinsText>
+      <View style={styles.mapContainer}>
+        <MapViewComponent
+          initialRegion={{
+            latitude: 37.7749,
+            longitude: -122.4194,
+            latitudeDelta: 0.0922,
+            longitudeDelta: 0.0421,
+          }}
+        />
+      </View>
     </View>
   );
 }
@@ -14,8 +25,9 @@ export default function BranchesScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
     backgroundColor: Colors.bgColor,
   },
+  mapContainer: {
+    flex: 1, // Asegura que el mapa ocupe todo el espacio disponible
+  },
 });

From 5f1166d891e61408dd3b08d86751acee274bc647 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 5 Apr 2025 13:10:52 -0400
Subject: [PATCH 065/291] Showing account verification after login if user
 skipped it after registering

---
 src/screens/LoginScreen.tsx    | 22 ++++++++++++++++------
 src/screens/tab/HomeScreen.tsx |  2 +-
 src/services/auth.ts           | 32 +++++++++++++++++++++++++++-----
 3 files changed, 44 insertions(+), 12 deletions(-)

diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index cbe2a5f..bec0ecb 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -35,14 +35,24 @@ export default function LoginScreen() {
     try {
       const result = await AuthService.login(email, password);
       if (result.success) {
-        setShowSuccessAlert(true);
-        setTimeout(() => {
-          setShowSuccessAlert(false);
-          router.replace('/(tabs)');
-        }, 2000);
+        const { isValidated } = result.data!;
+        if (!isValidated) {
+          // Redirigir al home con el modal de verificación de correo
+          router.replace({
+            pathname: '/(tabs)',
+            params: { showEmailVerification: 'true' },
+          });
+        } else {
+          // Redirigir al home si el correo ya está validado
+          setShowSuccessAlert(true);
+          setTimeout(() => {
+            setShowSuccessAlert(false);
+            router.replace('/(tabs)');
+          }, 2000);
+        }
       } else {
         setShowErrorAlert(true);
-        setErrorMessage('Error al iniciar sesión, verifica tus credenciales.');
+        setErrorMessage(result.error || 'Error al iniciar sesión.');
       }
     } catch (error) {
       console.error(error);
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 43a0f5a..7125367 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -80,7 +80,7 @@ export default function HomeScreen() {
     if (showEmailVerificationParam) {
       const timer = setTimeout(() => {
         setShowEmailVerification(true);
-      }, 3000);
+      }, 2000);
       return () => clearTimeout(timer);
     }
   }, [showEmailVerificationParam]);
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 52edefc..802a29a 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -6,9 +6,13 @@ import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
 import { store } from '../redux/store';
 import { setUserId } from '../redux/slices/cartSlice';
+import { UserService } from './user';
 
 export const AuthService = {
-  login: async (email: string, password: string): Promise<ServiceResponse> => {
+  login: async (
+    email: string,
+    password: string,
+  ): Promise<ServiceResponse<{ isValidated: boolean }>> => {
     try {
       if (!validateEmail(email)) {
         return { success: false, error: 'Correo electrónico inválido' };
@@ -20,14 +24,32 @@ export const AuthService = {
         password: password.trim(),
       });
 
+      // Guardar el token en SecureStore
       await SecureStore.setItemAsync('auth_token', accessToken);
 
-      await SecureStore.deleteItemAsync('user_data');
+      // Obtener el perfil del usuario para verificar el estado de isValidated
+      const profileResponse = await UserService.getProfile();
+      if (!profileResponse.success) {
+        return {
+          success: false,
+          error: 'Error al obtener el perfil del usuario',
+        };
+      }
 
-      const decoded = decodeJWT(accessToken);
-      store.dispatch(setUserId(decoded?.userId || null));
+      const isValidated = profileResponse.data?.isValidated || false;
+
+      // Si el usuario no está validado, enviar automáticamente el OTP
+      if (!isValidated) {
+        const resendResponse = await AuthService.resendOtp();
+        if (!resendResponse.success) {
+          return {
+            success: false,
+            error: 'Error al enviar el OTP. Inténtalo nuevamente.',
+          };
+        }
+      }
 
-      return { success: true, data: undefined };
+      return { success: true, data: { isValidated } };
     } catch (error) {
       return {
         success: false,

From ba117325c2accec5e83b2b1a8c26e7b9a32ae5ec Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 5 Apr 2025 15:51:07 -0400
Subject: [PATCH 066/291] fixing password recovery issue

---
 src/lib/sdkConfig.ts                   |  6 ++++++
 src/screens/PasswordRecoveryScreen.tsx | 29 +++++++++++++++++++-------
 src/services/auth.ts                   | 27 +++++++++++++++++++-----
 3 files changed, 49 insertions(+), 13 deletions(-)

diff --git a/src/lib/sdkConfig.ts b/src/lib/sdkConfig.ts
index 3f0e513..f176265 100644
--- a/src/lib/sdkConfig.ts
+++ b/src/lib/sdkConfig.ts
@@ -15,6 +15,12 @@ export const api = new PharmaTech(
 // Configurar un interceptor para manejar dinámicamente el JWT
 api.client['client'].interceptors.request.use(
   async (config: AxiosRequestConfig) => {
+    // Si ya se pasa un jwt explícitamente, no agregar el auth_token
+    if (config.headers?.Authorization) {
+      return config;
+    }
+
+    // Obtener el auth_token de SecureStore
     const token = await SecureStore.getItemAsync('auth_token');
     if (token) {
       config.headers = {
diff --git a/src/screens/PasswordRecoveryScreen.tsx b/src/screens/PasswordRecoveryScreen.tsx
index 5192ece..9c1fe95 100644
--- a/src/screens/PasswordRecoveryScreen.tsx
+++ b/src/screens/PasswordRecoveryScreen.tsx
@@ -107,15 +107,28 @@ export default function PasswordRecoveryScreen() {
     }
 
     setLoading(true);
-    const result = await AuthService.resetPassword(enteredCode);
-    setLoading(false);
-
-    if (result.success) {
-      setAccessToken(result.data);
-      handleStepChange(3);
-    } else {
-      setErrorMessage(result.error);
+    try {
+      const result = await AuthService.resetPassword(enteredCode);
+      if (result.success) {
+        setAccessToken(result.data);
+        handleStepChange(3); // Avanzar al siguiente paso
+      } else {
+        // Limpiar el estado del código y permitir un nuevo intento
+        setCode(['', '', '', '', '', '']);
+        setErrorMessage(
+          result.error ||
+            'El código ingresado es incorrecto. Inténtalo nuevamente.',
+        );
+        setShowErrorAlert(true);
+      }
+    } catch (error) {
+      console.error('Error al verificar el código:', error);
+      setErrorMessage(
+        'Error inesperado al verificar el código. Inténtalo nuevamente.',
+      );
       setShowErrorAlert(true);
+    } finally {
+      setLoading(false);
     }
   };
 
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 802a29a..8ffd730 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -27,6 +27,11 @@ export const AuthService = {
       // Guardar el token en SecureStore
       await SecureStore.setItemAsync('auth_token', accessToken);
 
+      await SecureStore.deleteItemAsync('user_data');
+
+      const decoded = decodeJWT(accessToken);
+      store.dispatch(setUserId(decoded?.userId || null));
+
       // Obtener el perfil del usuario para verificar el estado de isValidated
       const profileResponse = await UserService.getProfile();
       if (!profileResponse.success) {
@@ -145,10 +150,15 @@ export const AuthService = {
 
       return { success: true, data: accessToken };
     } catch (error) {
-      return {
-        success: false,
-        error: extractErrorMessage(error),
-      };
+      // Manejar errores específicos del backend
+      const errorMessage = extractErrorMessage(error);
+      if (errorMessage.includes('invalid')) {
+        return {
+          success: false,
+          error: 'El código ingresado es incorrecto o ha expirado.',
+        };
+      }
+      return { success: false, error: errorMessage };
     }
   },
 
@@ -161,9 +171,16 @@ export const AuthService = {
         return { success: false, error: 'Las contraseñas no coinciden' };
       }
 
-      const token = (await SecureStore.getItemAsync('reset_token')) || '';
+      const token = (await SecureStore.getItemAsync('reset_token')) || ''; // Obtener el token
+      if (!token) {
+        return { success: false, error: 'Token de recuperación no encontrado' };
+      }
+
       await api.auth.updatePassword(newPassword.trim(), token);
 
+      // Logout silencioso para limpiar la sesión
+      await AuthService.logout();
+
       return { success: true, data: undefined };
     } catch (error) {
       return {

From 905126e735f19a2af0927a006a07448cb493448d Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 5 Apr 2025 18:07:27 -0400
Subject: [PATCH 067/291] fixing password recovery flow while logged in

---
 src/app/_layout.tsx                           |   4 +
 src/app/loggedInPasswordRecovery.tsx          |   2 +
 src/components/TopBar.tsx                     |   6 +
 .../LoggedInPasswordRecoveryScreen.tsx        | 350 ++++++++++++++++++
 src/screens/LoginScreen.tsx                   |  30 +-
 src/screens/PasswordChangeScreen.tsx          |   2 +-
 src/services/auth.ts                          |  16 +-
 7 files changed, 394 insertions(+), 16 deletions(-)
 create mode 100644 src/app/loggedInPasswordRecovery.tsx
 create mode 100644 src/screens/LoggedInPasswordRecoveryScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 19fdc7b..1b030f1 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -76,6 +76,10 @@ export default function RootLayout() {
           name="passwordRecovery"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="loggedInPasswordRecovery"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
         <Stack.Screen
           name="success"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/loggedInPasswordRecovery.tsx b/src/app/loggedInPasswordRecovery.tsx
new file mode 100644
index 0000000..49cfc60
--- /dev/null
+++ b/src/app/loggedInPasswordRecovery.tsx
@@ -0,0 +1,2 @@
+import LoggedInPasswordRecoveryScreen from '../screens/LoggedInPasswordRecoveryScreen';
+export default LoggedInPasswordRecoveryScreen;
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index e100df7..34474e4 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -33,6 +33,12 @@ const TopBar = () => {
     try {
       await AuthService.logout(); // Llama al método logout del servicio de autenticación
       setIsLogoutConfirmationVisible(false); // Cierra el popup de confirmación
+
+      // Verificar si hay pantallas en la pila antes de llamar a dismissAll
+      if (router.canGoBack()) {
+        router.dismissAll();
+      }
+
       router.replace('/login'); // Redirige a la pantalla de inicio de sesión
     } catch (error) {
       console.error('Error al cerrar sesión:', error);
diff --git a/src/screens/LoggedInPasswordRecoveryScreen.tsx b/src/screens/LoggedInPasswordRecoveryScreen.tsx
new file mode 100644
index 0000000..a024cdc
--- /dev/null
+++ b/src/screens/LoggedInPasswordRecoveryScreen.tsx
@@ -0,0 +1,350 @@
+import React, { useState, useCallback, useRef, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  TextInput,
+  Animated,
+} from 'react-native';
+import { useRouter } from 'expo-router';
+import Button from '../components/Button';
+import Input from '../components/Input';
+import PoppinsText from '../components/PoppinsText';
+import Steps from '../components/Steps';
+import Alert from '../components/Alerts';
+import { Colors, FontSizes } from '../styles/theme';
+import { AuthService } from '../services/auth';
+import { UserService } from '../services/user';
+
+export default function LoggedInPasswordRecoveryScreen() {
+  const router = useRouter();
+  const [currentStep, setCurrentStep] = useState(1); // Comenzar en el primer step visual (Código)
+  const fadeAnim = useRef(new Animated.Value(1)).current;
+  const [loading, setLoading] = useState(false);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const codeRefs = useRef<Array<TextInput>>([]);
+  const [code, setCode] = useState(['', '', '', '', '', '']);
+  const [newPassword, setNewPassword] = useState('');
+  const [confirmPassword, setConfirmPassword] = useState('');
+
+  useEffect(() => {
+    const sendOtpAutomatically = async () => {
+      setLoading(true);
+      try {
+        // Obtener el correo del usuario logueado
+        const profileResponse = await UserService.getProfile();
+        if (!profileResponse.success || !profileResponse.data?.email) {
+          throw new Error('No se pudo obtener el correo del usuario.');
+        }
+
+        const email = profileResponse.data.email;
+
+        // Enviar OTP automáticamente
+        const forgotPasswordResponse = await AuthService.forgotPassword(email);
+        if (!forgotPasswordResponse.success) {
+          throw new Error(
+            forgotPasswordResponse.error || 'Error al enviar el OTP.',
+          );
+        }
+      } catch (error: unknown) {
+        if (error instanceof Error) {
+          setErrorMessage(error.message || 'Error inesperado.');
+        } else {
+          setErrorMessage('Error inesperado.');
+        }
+        setShowErrorAlert(true);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    sendOtpAutomatically();
+  }, []);
+
+  const handleStepChange = (newStep: number) => {
+    Animated.timing(fadeAnim, {
+      toValue: 0,
+      duration: 200,
+      useNativeDriver: true,
+    }).start(() => {
+      setCurrentStep(newStep);
+      Animated.timing(fadeAnim, {
+        toValue: 1,
+        duration: 200,
+        useNativeDriver: true,
+      }).start();
+    });
+  };
+
+  const handleVerifyCode = async () => {
+    const enteredCode = code.join('');
+    if (enteredCode.length !== 6) {
+      setErrorMessage('El código debe tener 6 dígitos');
+      setShowErrorAlert(true);
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const result = await AuthService.resetPassword(enteredCode);
+      if (result.success) {
+        handleStepChange(2); // Avanzar al siguiente paso (Recuperar Contraseña)
+      } else {
+        setCode(['', '', '', '', '', '']);
+        setErrorMessage(
+          result.error ||
+            'El código ingresado es incorrecto. Inténtalo nuevamente.',
+        );
+        setShowErrorAlert(true);
+      }
+    } catch (error) {
+      console.error('Error al verificar el código:', error);
+      setErrorMessage(
+        'Error inesperado al verificar el código. Inténtalo nuevamente.',
+      );
+      setShowErrorAlert(true);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const handleChangePassword = async () => {
+    if (newPassword !== confirmPassword) {
+      setErrorMessage('Las contraseñas no coinciden');
+      setShowErrorAlert(true);
+      return;
+    }
+
+    setLoading(true);
+    const result = await AuthService.updatePassword(
+      newPassword,
+      confirmPassword,
+    );
+    setLoading(false);
+
+    if (result.success) {
+      setShowSuccessAlert(true);
+
+      // Cerrar sesión y redirigir al login
+      await AuthService.logout();
+      router.dismissAll();
+
+      setTimeout(() => {
+        router.replace('/login');
+      }, 2000);
+    } else {
+      setErrorMessage(result.error);
+      setShowErrorAlert(true);
+    }
+  };
+
+  const renderCodeInputs = useCallback(() => {
+    return (
+      <View style={styles.codeContainer}>
+        {code.map((digit, index) => (
+          <TextInput
+            key={index}
+            ref={(ref) => (codeRefs.current[index] = ref as TextInput)}
+            placeholder="•"
+            placeholderTextColor={Colors.textLowContrast}
+            style={styles.codeInput}
+            caretHidden={true}
+            keyboardType="number-pad"
+            maxLength={1}
+            value={digit}
+            onChangeText={(text) => {
+              const newCode = [...code];
+              const cleanedText = text.replace(/[^0-9]/g, '');
+              newCode[index] = cleanedText;
+              setCode(newCode);
+              if (cleanedText && index < 5) {
+                codeRefs.current[index + 1]?.focus();
+              }
+            }}
+            onKeyPress={({ nativeEvent }) => {
+              if (nativeEvent.key === 'Backspace' && !digit && index > 0) {
+                const newCode = [...code];
+                newCode[index - 1] = '';
+                setCode(newCode);
+                codeRefs.current[index - 1]?.focus();
+              }
+            }}
+          />
+        ))}
+      </View>
+    );
+  }, [code]);
+
+  const renderStepContent = () => {
+    switch (currentStep) {
+      case 1:
+        return (
+          <View style={styles.stepContainer}>
+            <PoppinsText weight="medium" style={styles.stepTitle}>
+              Introducir código
+            </PoppinsText>
+            <PoppinsText weight="regular" style={styles.stepDescription}>
+              Introduce el código de 6 dígitos que te enviamos a tu correo.
+            </PoppinsText>
+            {renderCodeInputs()}
+            <Button
+              title="Verificar"
+              onPress={handleVerifyCode}
+              style={styles.button}
+              size="medium"
+              loading={loading}
+            />
+          </View>
+        );
+
+      case 2:
+        return (
+          <View style={styles.stepContainer}>
+            <PoppinsText weight="medium" style={styles.stepTitle}>
+              Recuperar contraseña
+            </PoppinsText>
+            <PoppinsText weight="regular" style={styles.stepDescription}>
+              Ingresa tu nueva contraseña y confírmala.
+            </PoppinsText>
+            <Input
+              label="Nueva contraseña"
+              placeholder="Ingresa tu nueva contraseña"
+              value={newPassword}
+              fieldType="password"
+              getValue={setNewPassword}
+              backgroundColor={Colors.menuWhite}
+              errorText="La contraseña debe tener al menos 8 caracteres"
+            />
+            <Input
+              label="Confirmar contraseña"
+              placeholder="Confirma tu nueva contraseña"
+              value={confirmPassword}
+              fieldType="password"
+              getValue={setConfirmPassword}
+              backgroundColor={Colors.menuWhite}
+              errorText="Las contraseñas no coinciden"
+            />
+            <Button
+              title="Cambiar contraseña"
+              onPress={handleChangePassword}
+              style={styles.button}
+              size="medium"
+              loading={loading}
+            />
+          </View>
+        );
+
+      default:
+        return null;
+    }
+  };
+
+  return (
+    <View style={{ flex: 1 }}>
+      <View style={styles.alertsContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            alertStyle="regular"
+            borderColor
+            onClose={() => setShowErrorAlert(false)}
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Contraseña actualizada"
+            message="Redirigiendo al inicio de sesión..."
+            alertStyle="regular"
+            borderColor
+            onClose={() => setShowSuccessAlert(false)}
+          />
+        )}
+      </View>
+      <Animated.View style={{ opacity: fadeAnim, flex: 1 }}>
+        <ScrollView contentContainerStyle={styles.container}>
+          <View style={styles.stepsWrapper}>
+            <Steps
+              totalSteps={2} // Solo dos steps visuales
+              currentStep={currentStep}
+              labels={['Código', 'Recuperar Contraseña']}
+            />
+          </View>
+          {renderStepContent()}
+        </ScrollView>
+      </Animated.View>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    justifyContent: 'flex-start',
+    paddingTop: 56,
+    paddingHorizontal: 20,
+  },
+  stepsWrapper: {
+    marginBottom: 12,
+    paddingHorizontal: 16,
+  },
+  stepContainer: {
+    width: '100%',
+    marginVertical: 16,
+  },
+  alertsContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  stepTitle: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 24,
+    textAlign: 'center',
+  },
+  stepDescription: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textLowContrast,
+    textAlign: 'center',
+    marginBottom: 24,
+  },
+  codeContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginHorizontal: 8,
+    marginBottom: 16,
+  },
+  codeInput: {
+    width: 42,
+    height: 48,
+    borderWidth: 1,
+    borderColor: Colors.stroke,
+    textAlign: 'center',
+    fontFamily: 'Poppins_400Regular',
+    color: Colors.textMain,
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    borderRadius: 8,
+    backgroundColor: Colors.menuWhite,
+    includeFontPadding: false,
+    padding: 0,
+    textAlignVertical: 'center',
+  },
+  button: {
+    marginTop: 20,
+    width: '100%',
+    height: 50,
+  },
+});
diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index bec0ecb..6ab0a84 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -36,20 +36,24 @@ export default function LoginScreen() {
       const result = await AuthService.login(email, password);
       if (result.success) {
         const { isValidated } = result.data!;
-        if (!isValidated) {
-          // Redirigir al home con el modal de verificación de correo
-          router.replace({
-            pathname: '/(tabs)',
-            params: { showEmailVerification: 'true' },
-          });
-        } else {
-          // Redirigir al home si el correo ya está validado
-          setShowSuccessAlert(true);
-          setTimeout(() => {
-            setShowSuccessAlert(false);
+
+        // Mostrar alerta de éxito para todos los usuarios
+        setShowSuccessAlert(true);
+
+        setTimeout(() => {
+          setShowSuccessAlert(false);
+
+          if (!isValidated) {
+            // Redirigir al home con el modal de verificación de correo
+            router.replace({
+              pathname: '/(tabs)',
+              params: { showEmailVerification: 'true' },
+            });
+          } else {
+            // Redirigir al home si el correo ya está validado
             router.replace('/(tabs)');
-          }, 2000);
-        }
+          }
+        }, 2000);
       } else {
         setShowErrorAlert(true);
         setErrorMessage(result.error || 'Error al iniciar sesión.');
diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index 48eea55..cb3f541 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -168,7 +168,7 @@ export default function ChangePasswordScreen() {
                 ¿Olvidaste tu contraseña?{' '}
               </PoppinsText>
               <TouchableOpacity
-                onPress={() => router.push('/passwordRecovery')}
+                onPress={() => router.push('/loggedInPasswordRecovery')}
               >
                 <PoppinsText weight="regular" style={styles.forgotPasswordLink}>
                   Ingresa aquí
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 8ffd730..567b516 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -171,12 +171,23 @@ export const AuthService = {
         return { success: false, error: 'Las contraseñas no coinciden' };
       }
 
-      const token = (await SecureStore.getItemAsync('reset_token')) || ''; // Obtener el token
+      const token = (await SecureStore.getItemAsync('reset_token')) || ''; // Obtener el reset_token
       if (!token) {
         return { success: false, error: 'Token de recuperación no encontrado' };
       }
 
-      await api.auth.updatePassword(newPassword.trim(), token);
+      // Realizar la solicitud sobrescribiendo el header Authorization
+      await api.client['client'].patch(
+        '/auth/password',
+        {
+          password: newPassword.trim(),
+        },
+        {
+          headers: {
+            Authorization: `Bearer ${token}`, // Sobrescribir el header con el reset_token
+          },
+        },
+      );
 
       // Logout silencioso para limpiar la sesión
       await AuthService.logout();
@@ -207,6 +218,7 @@ export const AuthService = {
     try {
       // Eliminar el token del SecureStore
       await SecureStore.deleteItemAsync('auth_token');
+      await SecureStore.deleteItemAsync('reset_token');
 
       // Eliminar los interceptores configurados en el cliente HTTP
       const interceptors = api.client['client'].interceptors.request;

From bc3db1cd15999f54e5ae1a198dab4d25ce3b1ba5 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 5 Apr 2025 21:49:02 -0400
Subject: [PATCH 068/291] progressing with maps integration

---
 app.json                            |  2 +-
 src/components/BranchMap.tsx        | 90 +++++++++++++++++++++++++++++
 src/screens/ProductDetailScreen.tsx | 30 +++++++---
 3 files changed, 114 insertions(+), 8 deletions(-)
 create mode 100644 src/components/BranchMap.tsx

diff --git a/app.json b/app.json
index 1cef0db..aeee46e 100644
--- a/app.json
+++ b/app.json
@@ -24,7 +24,7 @@
       "package": "com.pharmatech.pharmatech",
       "config": {
         "googleMaps": {
-          "apiKey": "AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU"
+          "apiKey": "process.env.GOOGLE_MAPS_API_KEY"
         }
       }
     },
diff --git a/src/components/BranchMap.tsx b/src/components/BranchMap.tsx
new file mode 100644
index 0000000..472b8c5
--- /dev/null
+++ b/src/components/BranchMap.tsx
@@ -0,0 +1,90 @@
+import React from 'react';
+import { StyleSheet, View, Text } from 'react-native';
+import MapView, { Marker, PROVIDER_GOOGLE } from 'react-native-maps';
+
+type Branch = {
+  id: string;
+  name: string;
+  address: string;
+  latitude: number | null | undefined;
+  longitude: number | null | undefined;
+  stockQuantity: number;
+};
+
+type BranchMapProps = {
+  branches: Branch[];
+};
+
+const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
+  // Filtrar sucursales con coordenadas válidas
+  const validBranches = branches.filter(
+    (branch) =>
+      branch.latitude !== null &&
+      branch.latitude !== undefined &&
+      branch.longitude !== null &&
+      branch.longitude !== undefined,
+  );
+
+  // Configurar la región inicial del mapa
+  const initialRegion =
+    validBranches.length > 0
+      ? {
+          latitude: validBranches[0].latitude!,
+          longitude: validBranches[0].longitude!,
+          latitudeDelta: 0.1,
+          longitudeDelta: 0.1,
+        }
+      : {
+          latitude: 37.7749, // Coordenadas predeterminadas (San Francisco)
+          longitude: -122.4194,
+          latitudeDelta: 0.1,
+          longitudeDelta: 0.1,
+        };
+
+  return (
+    <View style={styles.container}>
+      {validBranches.length > 0 ? (
+        <MapView
+          provider={PROVIDER_GOOGLE}
+          style={styles.map}
+          initialRegion={initialRegion}
+        >
+          {validBranches.map((branch) => (
+            <Marker
+              key={branch.id}
+              coordinate={{
+                latitude: branch.latitude!,
+                longitude: branch.longitude!,
+              }}
+              title={branch.name}
+              description={`Stock: ${branch.stockQuantity}`}
+            />
+          ))}
+        </MapView>
+      ) : (
+        <Text style={styles.noDataText}>
+          No hay sucursales disponibles para mostrar en el mapa.
+        </Text>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    height: 300, // Altura fija para el mapa
+    borderRadius: 10,
+    overflow: 'hidden',
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+  noDataText: {
+    textAlign: 'center',
+    marginTop: 20,
+    color: 'gray',
+  },
+});
+
+export default BranchMap;
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index aa331d1..bee1fd9 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -30,6 +30,7 @@ import { StateService } from '../services/state';
 import { Inventory, State } from '../types/api';
 import { InventoryService } from '../services/inventory';
 import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
+import BranchMap from '../components/BranchMap';
 
 type Product = {
   id: string;
@@ -344,13 +345,28 @@ const ProductDetailScreen: React.FC = () => {
             </PoppinsText>
             <View style={styles.quantitySelector}>
               <View style={styles.mapContainer}>
-                <Image
-                  source={{
-                    uri: 'https://s3-alpha-sig.figma.com/img/e1d4/243c/e04ae0848573e5aec930a59844b09c9d?Expires=1743984000&Key-Pair-Id=APKAQ4GOSFWCW27IBOMQ&Signature=FXKYpecuImVVY6u2fXMUb9gNHckqHMuudCo5P2d8nKpcX4UOIDviLX9axkku~lqIwrFxFrrwi-K1SfHW9Ptvp1YCeRMuw12APbec9X45pxjdXxZZ7B--elUAPERCWzJXmX3WSxW~YIYfqMtK6Ld~3w4JXKif0ajl9zkzojgF-ZxGsddzhXL3Th~tgIrzCy3Nmv5tNFClXiweA3weh~tnqR3xKhsqr0YmPWihV24a40aDrQw-Qk1ilxuDYwZJ3sChx8TPXPIeM3K0dsjGkENGbHmqe5qHt4UWce1PGpPs4TnaCl~DmwdgIYRZP3TywbDsNZbXR9OQdFTB2EToVFmFvQ__',
-                  }}
-                  style={{ width: 300, height: 300, borderRadius: 5 }}
-                  resizeMode="contain"
-                />
+                {inventory && inventory.length > 0 ? (
+                  <BranchMap
+                    branches={inventory.map((inv) => ({
+                      id: inv.branch.id,
+                      name: inv.branch.name,
+                      address: inv.branch.address,
+                      latitude: inv.branch.latitude,
+                      longitude: inv.branch.longitude,
+                      stockQuantity: inv.stockQuantity,
+                    }))}
+                  />
+                ) : (
+                  <PoppinsText
+                    style={{
+                      textAlign: 'center',
+                      color: Colors.textLowContrast,
+                      marginVertical: 10,
+                    }}
+                  >
+                    No hay productos disponibles
+                  </PoppinsText>
+                )}
               </View>
             </View>
             <PoppinsText style={styles.sectionTitle}>

From 0518a25b4db5e1eb20ac1f982a13fc2f675006a3 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 6 Apr 2025 16:34:12 -0400
Subject: [PATCH 069/291] showing product details map

---
 src/components/BranchMap.tsx        | 45 ++++++++++++++----------
 src/screens/ProductDetailScreen.tsx | 54 +++++++++++++++++++----------
 2 files changed, 62 insertions(+), 37 deletions(-)

diff --git a/src/components/BranchMap.tsx b/src/components/BranchMap.tsx
index 472b8c5..907107e 100644
--- a/src/components/BranchMap.tsx
+++ b/src/components/BranchMap.tsx
@@ -1,6 +1,7 @@
 import React from 'react';
-import { StyleSheet, View, Text } from 'react-native';
+import { StyleSheet, View } from 'react-native';
 import MapView, { Marker, PROVIDER_GOOGLE } from 'react-native-maps';
+import PoppinsText from './PoppinsText';
 
 type Branch = {
   id: string;
@@ -16,6 +17,8 @@ type BranchMapProps = {
 };
 
 const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
+  console.log('Branches received in BranchMap:', branches); // Log para inspeccionar las sucursales recibidas
+
   // Filtrar sucursales con coordenadas válidas
   const validBranches = branches.filter(
     (branch) =>
@@ -25,6 +28,8 @@ const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
       branch.longitude !== undefined,
   );
 
+  console.log('Valid branches after filtering:', validBranches); // Log para inspeccionar las sucursales válidas
+
   // Configurar la región inicial del mapa
   const initialRegion =
     validBranches.length > 0
@@ -41,6 +46,8 @@ const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
           longitudeDelta: 0.1,
         };
 
+  console.log('Initial region for the map:', initialRegion); // Log para inspeccionar la región inicial del mapa
+
   return (
     <View style={styles.container}>
       {validBranches.length > 0 ? (
@@ -49,22 +56,25 @@ const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
           style={styles.map}
           initialRegion={initialRegion}
         >
-          {validBranches.map((branch) => (
-            <Marker
-              key={branch.id}
-              coordinate={{
-                latitude: branch.latitude!,
-                longitude: branch.longitude!,
-              }}
-              title={branch.name}
-              description={`Stock: ${branch.stockQuantity}`}
-            />
-          ))}
+          {validBranches.map((branch) => {
+            console.log('Rendering Marker for branch:', branch); // Log para inspeccionar cada sucursal
+            return (
+              <Marker
+                key={branch.id}
+                coordinate={{
+                  latitude: branch.latitude!,
+                  longitude: branch.longitude!,
+                }}
+                title={branch.name}
+                description={`Stock: ${branch.stockQuantity ?? 'No disponible'}`} // Manejar undefined
+              />
+            );
+          })}
         </MapView>
       ) : (
-        <Text style={styles.noDataText}>
+        <PoppinsText style={styles.noDataText}>
           No hay sucursales disponibles para mostrar en el mapa.
-        </Text>
+        </PoppinsText>
       )}
     </View>
   );
@@ -72,13 +82,10 @@ const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
 
 const styles = StyleSheet.create({
   container: {
-    flex: 1,
-    height: 300, // Altura fija para el mapa
-    borderRadius: 10,
-    overflow: 'hidden',
+    flex: 1, // Asegura que el mapa ocupe todo el espacio disponible
   },
   map: {
-    ...StyleSheet.absoluteFillObject,
+    ...StyleSheet.absoluteFillObject, // Hace que el mapa ocupe todo el espacio del contenedor
   },
   noDataText: {
     textAlign: 'center',
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index bee1fd9..f498e9c 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -164,8 +164,10 @@ const ProductDetailScreen: React.FC = () => {
                 id: inv.branch.id,
                 name: inv.branch.name,
                 address: inv.branch.address,
-                stockQuantity: inv.stockQuantity,
+                latitude: inv.branch.latitude,
+                longitude: inv.branch.longitude,
               },
+              stockQuantity: inv.stockQuantity, // Mover al nivel superior
             }));
 
             setInventory((prevInventory) => {
@@ -234,13 +236,20 @@ const ProductDetailScreen: React.FC = () => {
     );
   };
 
+  console.log('Current inventory state:', inventory); // Log para inspeccionar el estado de inventory
+
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
       {/* Botón de volver */}
       <TouchableOpacity
         onPress={() => navigation.goBack()} // Navega a la pantalla anterior
-        style={{ padding: 10, flexDirection: 'row', alignItems: 'center' }}
+        style={{
+          paddingHorizontal: 10,
+          marginBottom: -4,
+          flexDirection: 'row',
+          alignItems: 'center',
+        }}
       >
         <ChevronLeftIcon
           width={16}
@@ -344,7 +353,7 @@ const ProductDetailScreen: React.FC = () => {
               Disponibilidad en sucursales
             </PoppinsText>
             <View style={styles.quantitySelector}>
-              <View style={styles.mapContainer}>
+              <View style={{ flex: 1, height: 300 }}>
                 {inventory && inventory.length > 0 ? (
                   <BranchMap
                     branches={inventory.map((inv) => ({
@@ -404,27 +413,36 @@ const ProductDetailScreen: React.FC = () => {
                         paddingHorizontal: 20,
                       }}
                     >
-                      <PoppinsText
-                        style={{
-                          fontSize: FontSizes.c1.size,
-                          color: Colors.textLowContrast,
-                        }}
+                      <View
+                        style={{ flexDirection: 'row', alignItems: 'center' }}
                       >
-                        {inv.branch.stockQuantity} unidades{' '}
+                        <PoppinsText
+                          style={{
+                            fontSize: FontSizes.c1.size,
+                            color: Colors.textLowContrast,
+                          }}
+                        >
+                          {inv.stockQuantity} unidades{' '}
+                        </PoppinsText>
                         <CheckCircleIcon
                           size={15}
                           color={Colors.semanticSuccess}
                         />
-                      </PoppinsText>
-                      <PoppinsText
-                        style={{
-                          fontSize: FontSizes.c3.size,
-                          color: Colors.gray_500,
-                        }}
+                      </View>
+                      <View
+                        style={{ flexDirection: 'row', alignItems: 'center' }}
                       >
-                        <TruckIcon size={15} color={Colors.gray_500} /> Envio en
-                        menos de 3h
-                      </PoppinsText>
+                        <TruckIcon size={15} color={Colors.gray_500} />
+                        <PoppinsText
+                          style={{
+                            fontSize: FontSizes.c3.size,
+                            color: Colors.gray_500,
+                            marginLeft: 5,
+                          }}
+                        >
+                          Envio en menos de 3h
+                        </PoppinsText>
+                      </View>
                     </View>
                   </View>
                 ))

From ce0781c1736ed89e2f5cdd0dbf3e18fbb50507ca Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 6 Apr 2025 17:54:35 -0400
Subject: [PATCH 070/291] Putting some styles to product details maps

---
 src/components/BranchMap.tsx        | 114 ++++++++++++++++------------
 src/screens/ProductDetailScreen.tsx |   5 --
 2 files changed, 67 insertions(+), 52 deletions(-)

diff --git a/src/components/BranchMap.tsx b/src/components/BranchMap.tsx
index 907107e..a4a80e2 100644
--- a/src/components/BranchMap.tsx
+++ b/src/components/BranchMap.tsx
@@ -1,6 +1,8 @@
-import React from 'react';
+import React, { useMemo } from 'react';
 import { StyleSheet, View } from 'react-native';
 import MapView, { Marker, PROVIDER_GOOGLE } from 'react-native-maps';
+import { Colors } from '../styles/theme';
+import { MapPinIcon } from 'react-native-heroicons/solid';
 import PoppinsText from './PoppinsText';
 
 type Branch = {
@@ -16,37 +18,56 @@ type BranchMapProps = {
   branches: Branch[];
 };
 
-const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
-  console.log('Branches received in BranchMap:', branches); // Log para inspeccionar las sucursales recibidas
-
-  // Filtrar sucursales con coordenadas válidas
-  const validBranches = branches.filter(
-    (branch) =>
-      branch.latitude !== null &&
-      branch.latitude !== undefined &&
-      branch.longitude !== null &&
-      branch.longitude !== undefined,
-  );
+// Componente Marker personalizado con React.memo
+const CustomMarker = React.memo(({ branch }: { branch: Branch }) => (
+  <Marker
+    key={branch.id}
+    coordinate={{
+      latitude: branch.latitude!,
+      longitude: branch.longitude!,
+    }}
+    title={branch.name}
+    description={`Stock: ${branch.stockQuantity ?? 'No disponible'}`}
+  >
+    <View style={styles.customMarker}>
+      <MapPinIcon size={32} color={Colors.primary} />
+    </View>
+  </Marker>
+));
 
-  console.log('Valid branches after filtering:', validBranches); // Log para inspeccionar las sucursales válidas
+CustomMarker.displayName = 'CustomMarker';
 
-  // Configurar la región inicial del mapa
-  const initialRegion =
-    validBranches.length > 0
-      ? {
-          latitude: validBranches[0].latitude!,
-          longitude: validBranches[0].longitude!,
-          latitudeDelta: 0.1,
-          longitudeDelta: 0.1,
-        }
-      : {
-          latitude: 37.7749, // Coordenadas predeterminadas (San Francisco)
-          longitude: -122.4194,
-          latitudeDelta: 0.1,
-          longitudeDelta: 0.1,
-        };
+const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
+  // Memorizar las sucursales válidas
+  const validBranches = useMemo(
+    () =>
+      branches.filter(
+        (branch) =>
+          branch.latitude !== null &&
+          branch.latitude !== undefined &&
+          branch.longitude !== null &&
+          branch.longitude !== undefined,
+      ),
+    [branches],
+  );
 
-  console.log('Initial region for the map:', initialRegion); // Log para inspeccionar la región inicial del mapa
+  const initialRegion = useMemo(
+    () =>
+      validBranches.length > 0
+        ? {
+            latitude: validBranches[0].latitude!,
+            longitude: validBranches[0].longitude!,
+            latitudeDelta: 0.1,
+            longitudeDelta: 0.1,
+          }
+        : {
+            latitude: 10.0678, // Coordenadas de Barquisimeto, estado Lara, Venezuela
+            longitude: -69.3467,
+            latitudeDelta: 0.1,
+            longitudeDelta: 0.1,
+          },
+    [validBranches],
+  );
 
   return (
     <View style={styles.container}>
@@ -56,25 +77,16 @@ const BranchMap: React.FC<BranchMapProps> = ({ branches }) => {
           style={styles.map}
           initialRegion={initialRegion}
         >
-          {validBranches.map((branch) => {
-            console.log('Rendering Marker for branch:', branch); // Log para inspeccionar cada sucursal
-            return (
-              <Marker
-                key={branch.id}
-                coordinate={{
-                  latitude: branch.latitude!,
-                  longitude: branch.longitude!,
-                }}
-                title={branch.name}
-                description={`Stock: ${branch.stockQuantity ?? 'No disponible'}`} // Manejar undefined
-              />
-            );
-          })}
+          {validBranches.map((branch) => (
+            <CustomMarker key={branch.id} branch={branch} />
+          ))}
         </MapView>
       ) : (
-        <PoppinsText style={styles.noDataText}>
-          No hay sucursales disponibles para mostrar en el mapa.
-        </PoppinsText>
+        <View style={styles.noDataContainer}>
+          <PoppinsText style={styles.noDataText}>
+            No hay sucursales disponibles para mostrar en el mapa.
+          </PoppinsText>
+        </View>
       )}
     </View>
   );
@@ -87,11 +99,19 @@ const styles = StyleSheet.create({
   map: {
     ...StyleSheet.absoluteFillObject, // Hace que el mapa ocupe todo el espacio del contenedor
   },
+  noDataContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
   noDataText: {
     textAlign: 'center',
-    marginTop: 20,
     color: 'gray',
   },
+  customMarker: {
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
 });
 
 export default BranchMap;
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index f498e9c..afd579e 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -546,11 +546,6 @@ const styles = StyleSheet.create({
     flexDirection: 'row',
     marginBottom: 15,
   },
-  footer: {
-    flexDirection: 'row-reverse',
-    padding: 16,
-    backgroundColor: '',
-  },
   ratingStarsContainer: {
     flexDirection: 'row',
     marginBottom: 20,

From 5af7046bb5a59141f9bacf4928f79e7ae5f7b049 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 6 Apr 2025 18:20:11 -0400
Subject: [PATCH 071/291] Update Avatar component to accept scale prop and
 implement AvatarWithMenu and SlideMenu components

---
 package-lock.json                 |   9 +-
 package.json                      |   2 +-
 src/components/Avatar.tsx         |  12 +-
 src/components/AvatarWithMenu.tsx |  67 +++++++++
 src/components/SlideMenu.tsx      | 229 ++++++++++++++++++++++++++++++
 src/components/TopBar.tsx         |   7 +-
 6 files changed, 312 insertions(+), 14 deletions(-)
 create mode 100644 src/components/AvatarWithMenu.tsx
 create mode 100644 src/components/SlideMenu.tsx

diff --git a/package-lock.json b/package-lock.json
index 173f644..85f94d8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.7",
+        "@pharmatech/sdk": "^0.3.10",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,10 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.7.tgz",
-      "integrity": "sha512-K19zZbULnpz3DcKCfVW6gSU7R63bipXJ3dsUq8GU/hAvHaw1LrrjdgUVVvlzvbNO5xCeGx8kfqSP7IZxtdA76g==",
-      "license": "MIT",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.10.tgz",
+      "integrity": "sha512-2Tsh//MKp6a1WcvcmCZl8SnDQWaMcWqjB1QWtxI8uwgoElaiZkCfOC4eX3hY78tUypvl6tke4S5+M8e96kQz+Q==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index fd3f6e8..057c1de 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.7",
+    "@pharmatech/sdk": "^0.3.10",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 1b906bd..cac9b2b 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -5,7 +5,11 @@ import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
 
-const Avatar: React.FC = () => {
+type AvatarProps = {
+  scale?: number;
+};
+
+const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
   const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
   const [loading, setLoading] = useState(true);
 
@@ -66,7 +70,7 @@ const Avatar: React.FC = () => {
   }
 
   return (
-    <View style={styles.avatar}>
+    <View style={[styles.avatar, { width: scale, height: scale }]}>
       {profile.uri ? (
         <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
       ) : (
@@ -80,9 +84,7 @@ const Avatar: React.FC = () => {
 
 const styles = StyleSheet.create({
   avatar: {
-    width: 32,
-    height: 32,
-    borderRadius: 16,
+    borderRadius: 100,
     backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
new file mode 100644
index 0000000..a3e8318
--- /dev/null
+++ b/src/components/AvatarWithMenu.tsx
@@ -0,0 +1,67 @@
+import React, { useState } from 'react';
+import { View, TouchableOpacity, StyleSheet } from 'react-native';
+import SlideMenu from './SlideMenu';
+import Avatar from './Avatar';
+import {
+  UserIcon,
+  MapIcon,
+  ShieldCheckIcon,
+  ShoppingCartIcon,
+} from 'react-native-heroicons/outline';
+import { Colors } from '../styles/theme';
+
+const AvatarWithMenu: React.FC = () => {
+  const [isMenuOpen, setIsMenuOpen] = useState(false);
+
+  const menuItems = [
+    {
+      id: '1',
+      title: 'Perfil',
+      icon: <UserIcon color={Colors.iconMainPrimary} />,
+      onPress: () => console.log('Perfil presionado'),
+    },
+    {
+      id: '2',
+      title: 'Mis Direcciones',
+      icon: <MapIcon color={Colors.iconMainPrimary} />,
+      onPress: () => console.log('Configuración presionada'),
+    },
+    {
+      id: '3',
+      title: 'Seguridad',
+      icon: <ShieldCheckIcon color={Colors.iconMainPrimary} />,
+      onPress: () => console.log('Cerrar sesión presionado'),
+    },
+    {
+      id: '4',
+      title: 'Mis Pedidos',
+      icon: <ShoppingCartIcon color={Colors.iconMainPrimary} />,
+      onPress: () => console.log('Cerrar sesión presionado'),
+    },
+  ];
+
+  return (
+    <View style={styles.container}>
+      <SlideMenu
+        isOpen={isMenuOpen}
+        onClose={() => setIsMenuOpen(false)}
+        items={menuItems}
+      />
+
+      <TouchableOpacity onPress={() => setIsMenuOpen(!isMenuOpen)}>
+        <Avatar />
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    position: 'absolute',
+    top: -15,
+    left: 0,
+    zIndex: 100,
+  },
+});
+
+export default AvatarWithMenu;
diff --git a/src/components/SlideMenu.tsx b/src/components/SlideMenu.tsx
new file mode 100644
index 0000000..e5f799b
--- /dev/null
+++ b/src/components/SlideMenu.tsx
@@ -0,0 +1,229 @@
+import React from 'react';
+import {
+  Animated,
+  StyleSheet,
+  TouchableOpacity,
+  View,
+  Dimensions,
+  SafeAreaView,
+  Easing,
+} from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+import { ChevronLeftIcon } from 'react-native-heroicons/solid';
+import Avatar from './Avatar';
+import { UserService } from '../services/user';
+import { ArrowUpTrayIcon } from 'react-native-heroicons/outline';
+
+const { width, height } = Dimensions.get('window');
+
+type MenuItem = {
+  id: string;
+  title: string;
+  icon?: React.ReactElement;
+  onPress: () => void;
+};
+
+type FullScreenSlideMenuProps = {
+  isOpen: boolean;
+  onClose: () => void;
+  items: MenuItem[];
+};
+
+const FullScreenSlideMenu: React.FC<FullScreenSlideMenuProps> = ({
+  isOpen,
+  onClose,
+  items,
+}) => {
+  const [userName, setUserName] = React.useState('');
+  const menuPosition = React.useRef(new Animated.Value(-width)).current;
+  const [isActive, setIsActive] = React.useState('');
+
+  React.useEffect(() => {
+    Animated.timing(menuPosition, {
+      toValue: isOpen ? 0 : -width,
+      duration: 250,
+      easing: Easing.out(Easing.ease),
+      useNativeDriver: true,
+    }).start();
+
+    const fetchProfile = async () => {
+      try {
+        const profile = await UserService.getProfile();
+
+        if (profile.success)
+          setUserName(profile.data.firstName + ' ' + profile.data.lastName);
+      } catch (error) {
+        console.log(error);
+      }
+    };
+
+    fetchProfile();
+    setIsActive('');
+  }, [isOpen, menuPosition]);
+
+  return (
+    <>
+      <Animated.View
+        style={[
+          styles.menu,
+          {
+            transform: [{ translateX: menuPosition }],
+          },
+        ]}
+      >
+        <SafeAreaView style={styles.safeArea}>
+          <View style={styles.menuContent}>
+            <View>
+              <TouchableOpacity
+                onPress={onClose}
+                style={{
+                  padding: 10,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon
+                  width={16}
+                  height={16}
+                  color={Colors.primary}
+                  style={{ marginRight: 2, marginLeft: 6 }}
+                />
+                <PoppinsText
+                  weight="medium"
+                  style={{
+                    fontSize: FontSizes.b1.size,
+                    lineHeight: FontSizes.b1.lineHeight,
+                    color: Colors.primary,
+                  }}
+                >
+                  Volver
+                </PoppinsText>
+              </TouchableOpacity>
+              <View style={{ padding: 20, flexDirection: 'row' }}>
+                <Avatar scale={40} />
+                <View>
+                  <PoppinsText
+                    weight="semibold"
+                    style={{ marginHorizontal: 10 }}
+                  >
+                    {userName}
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{ marginHorizontal: 10, color: Colors.gray_500 }}
+                  >
+                    Cuenta Personal
+                  </PoppinsText>
+                </View>
+              </View>
+              {items.map((item) => (
+                <TouchableOpacity
+                  key={item.id}
+                  style={[
+                    styles.menuItem,
+                    isActive == item.id && { borderStartWidth: 5 },
+                  ]}
+                  onPress={() => {
+                    item.onPress();
+                    onClose();
+                  }}
+                >
+                  {item.icon && (
+                    <View style={styles.menuIcon}>{item.icon}</View>
+                  )}
+                  <PoppinsText style={styles.menuText}>
+                    {item.title}
+                  </PoppinsText>
+                </TouchableOpacity>
+              ))}
+            </View>
+            <View
+              style={{
+                borderTopColor: Colors.gray_500,
+                borderTopWidth: 1,
+                marginVertical: 10,
+              }}
+            >
+              <TouchableOpacity
+                style={{
+                  flexDirection: 'row',
+                  padding: 15,
+                  alignContent: 'center',
+                }}
+              >
+                <View>
+                  <ArrowUpTrayIcon
+                    rotation={90}
+                    color={Colors.semanticDanger}
+                    size={20}
+                  />
+                </View>
+                <PoppinsText
+                  style={{ color: Colors.semanticDanger, marginHorizontal: 10 }}
+                >
+                  Cerrar Sesión
+                </PoppinsText>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </SafeAreaView>
+      </Animated.View>
+
+      {isOpen && (
+        <TouchableOpacity
+          style={styles.overlay}
+          onPress={onClose}
+          activeOpacity={0.5}
+        />
+      )}
+    </>
+  );
+};
+
+const styles = StyleSheet.create({
+  menu: {
+    position: 'absolute',
+    top: -25,
+    left: -15,
+    width: width,
+    height: height + 5,
+    backgroundColor: Colors.bgColor,
+    zIndex: 100,
+    elevation: 10,
+  },
+  safeArea: {
+    flex: 1,
+  },
+  menuContent: {
+    flex: 1,
+    paddingTop: 20,
+    paddingHorizontal: 15,
+    justifyContent: 'space-between',
+  },
+  menuItem: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 8,
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderColor: Colors.primary,
+    borderRadius: 5,
+  },
+  menuIcon: {
+    marginRight: 20,
+    fontSize: 24,
+    width: 30,
+    textAlign: 'center',
+  },
+  menuText: {
+    fontSize: 18,
+    color: '#333',
+  },
+  overlay: {
+    ...StyleSheet.absoluteFillObject,
+    backgroundColor: 'rgba(0,0,0,0.5)',
+    zIndex: 99,
+  },
+});
+
+export default FullScreenSlideMenu;
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index e100df7..726fe03 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -5,11 +5,11 @@ import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
 import { useRouter } from 'expo-router';
-import Avatar from './Avatar';
 import Popup from './Popup';
 import { AuthService } from '../services/auth';
 import Badge from './Badge';
 import { useCart } from '../hooks/useCart';
+import AvatarWithMenu from './AvatarWithMenu';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
@@ -45,9 +45,10 @@ const TopBar = () => {
       <View style={styles.topSection}>
         {/* Left user icon */}
         <View>
-          <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
+          <AvatarWithMenu />
+          {/* <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
             <Avatar />
-          </TouchableOpacity>
+          </TouchableOpacity> */}
         </View>
 
         {/* Logo */}

From d99442ae6dbb6925b66402eff2cf0ede6738c391 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 6 Apr 2025 18:39:37 -0400
Subject: [PATCH 072/291] proper integration of change password

---
 package-lock.json                             |  8 ++--
 package.json                                  |  2 +-
 .../LoggedInPasswordRecoveryScreen.tsx        | 44 ++++++++++++-------
 src/screens/PasswordChangeScreen.tsx          | 15 ++++++-
 src/services/auth.ts                          | 22 +++++++++-
 5 files changed, 65 insertions(+), 26 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 173f644..78a115d 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.7",
+        "@pharmatech/sdk": "^0.3.10",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.7",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.7.tgz",
-      "integrity": "sha512-K19zZbULnpz3DcKCfVW6gSU7R63bipXJ3dsUq8GU/hAvHaw1LrrjdgUVVvlzvbNO5xCeGx8kfqSP7IZxtdA76g==",
+      "version": "0.3.10",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.10.tgz",
+      "integrity": "sha512-2Tsh//MKp6a1WcvcmCZl8SnDQWaMcWqjB1QWtxI8uwgoElaiZkCfOC4eX3hY78tUypvl6tke4S5+M8e96kQz+Q==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index fd3f6e8..057c1de 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.7",
+    "@pharmatech/sdk": "^0.3.10",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/screens/LoggedInPasswordRecoveryScreen.tsx b/src/screens/LoggedInPasswordRecoveryScreen.tsx
index a024cdc..e2b2096 100644
--- a/src/screens/LoggedInPasswordRecoveryScreen.tsx
+++ b/src/screens/LoggedInPasswordRecoveryScreen.tsx
@@ -64,6 +64,10 @@ export default function LoggedInPasswordRecoveryScreen() {
   }, []);
 
   const handleStepChange = (newStep: number) => {
+    // Eliminar cualquier alerta de error al cambiar de paso
+    setShowErrorAlert(false);
+    setErrorMessage('');
+
     Animated.timing(fadeAnim, {
       toValue: 0,
       duration: 200,
@@ -118,25 +122,31 @@ export default function LoggedInPasswordRecoveryScreen() {
     }
 
     setLoading(true);
-    const result = await AuthService.updatePassword(
-      newPassword,
-      confirmPassword,
-    );
-    setLoading(false);
-
-    if (result.success) {
-      setShowSuccessAlert(true);
-
-      // Cerrar sesión y redirigir al login
-      await AuthService.logout();
-      router.dismissAll();
+    try {
+      const result = await AuthService.updatePassword(
+        newPassword,
+        confirmPassword,
+      );
+      if (result.success) {
+        // Mostrar alerta de éxito
+        setShowSuccessAlert(true);
 
-      setTimeout(() => {
-        router.replace('/login');
-      }, 2000);
-    } else {
-      setErrorMessage(result.error);
+        // Cerrar sesión y redirigir al login
+        setTimeout(async () => {
+          await AuthService.logout();
+          router.dismissAll(); // Cierra toda la pila de pantallas
+          router.replace('/login'); // Redirige al login
+        }, 2000); // Tiempo para mostrar la alerta
+      } else {
+        setErrorMessage(result.error || 'No se pudo cambiar la contraseña.');
+        setShowErrorAlert(true);
+      }
+    } catch (error) {
+      console.error('Error al cambiar la contraseña:', error);
+      setErrorMessage('Ocurrió un error inesperado.');
       setShowErrorAlert(true);
+    } finally {
+      setLoading(false);
     }
   };
 
diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index cb3f541..595e918 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -76,10 +76,21 @@ export default function ChangePasswordScreen() {
 
     setLoading(true);
     try {
-      const result = await AuthService.changePassword(newPassword);
+      const result = await AuthService.changePassword(
+        currentPassword,
+        newPassword,
+      );
       if (result.success) {
+        // Mostrar alerta de éxito
         showAlert('success', 'Éxito', 'Contraseña cambiada correctamente.');
-        setTimeout(() => router.replace('/categories'), 3000);
+
+        // Esperar un momento para que el usuario vea la alerta
+        setTimeout(async () => {
+          // Cerrar sesión y redirigir al login
+          await AuthService.logout();
+          router.dismissAll(); // Cierra toda la pila de pantallas
+          router.replace('/login'); // Redirige al login
+        }, 2000); // Tiempo para mostrar la alerta
       } else {
         showAlert(
           'error',
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 567b516..844d565 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -201,12 +201,30 @@ export const AuthService = {
     }
   },
 
-  changePassword: async (newPassword: string): Promise<ServiceResponse> => {
+  changePassword: async (
+    currentPassword: string,
+    newPassword: string,
+  ): Promise<ServiceResponse> => {
     try {
+      // Obtener el token de autenticación almacenado
       const token = (await SecureStore.getItemAsync('auth_token')) || '';
-      await api.auth.updatePassword(newPassword.trim(), token);
+      if (!token) {
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      // Llamar al endpoint updateCurrentPassword del SDK
+      await api.auth.updateCurrentPassword(
+        currentPassword.trim(),
+        newPassword.trim(),
+        token,
+      );
+
       return { success: true, data: undefined };
     } catch (error) {
+      // Manejar errores específicos del backend
       return {
         success: false,
         error: extractErrorMessage(error),

From f06240c7bce9895433e88457daa78e88d6730331 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 6 Apr 2025 20:44:39 -0400
Subject: [PATCH 073/291] Add Profile screen and related components; implement
 profile update functionality

---
 src/app/_layout.tsx               |   1 +
 src/app/profile.tsx               |   2 +
 src/components/AvatarWithMenu.tsx |   4 +-
 src/components/Input.tsx          |   2 +-
 src/components/Return.tsx         |  41 ++++
 src/screens/ProfileScreen.tsx     | 323 ++++++++++++++++++++++++++++++
 src/services/user.ts              |  33 ++-
 src/types/api.d.ts                |  11 +
 8 files changed, 414 insertions(+), 3 deletions(-)
 create mode 100644 src/app/profile.tsx
 create mode 100644 src/components/Return.tsx
 create mode 100644 src/screens/ProfileScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 19fdc7b..dac5c92 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -68,6 +68,7 @@ export default function RootLayout() {
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen name="products" options={{ headerShown: false }} />
+        <Stack.Screen name="profile" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/profile.tsx b/src/app/profile.tsx
new file mode 100644
index 0000000..f48c96f
--- /dev/null
+++ b/src/app/profile.tsx
@@ -0,0 +1,2 @@
+import ProfileScreen from '../screens/ProfileScreen';
+export default ProfileScreen;
diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
index a3e8318..8407423 100644
--- a/src/components/AvatarWithMenu.tsx
+++ b/src/components/AvatarWithMenu.tsx
@@ -9,16 +9,18 @@ import {
   ShoppingCartIcon,
 } from 'react-native-heroicons/outline';
 import { Colors } from '../styles/theme';
+import { useRouter } from 'expo-router';
 
 const AvatarWithMenu: React.FC = () => {
   const [isMenuOpen, setIsMenuOpen] = useState(false);
+  const router = useRouter();
 
   const menuItems = [
     {
       id: '1',
       title: 'Perfil',
       icon: <UserIcon color={Colors.iconMainPrimary} />,
-      onPress: () => console.log('Perfil presionado'),
+      onPress: () => router.push('/profile'),
     },
     {
       id: '2',
diff --git a/src/components/Input.tsx b/src/components/Input.tsx
index 18ec500..0af223c 100644
--- a/src/components/Input.tsx
+++ b/src/components/Input.tsx
@@ -146,7 +146,7 @@ const Input: React.FC<InputProps> = ({
             backgroundColor: backgroundColor
               ? backgroundColor
               : !isEditable
-                ? Colors.disableText
+                ? Colors.gray_100
                 : 'transparent',
           },
         ]}
diff --git a/src/components/Return.tsx b/src/components/Return.tsx
new file mode 100644
index 0000000..df6d80e
--- /dev/null
+++ b/src/components/Return.tsx
@@ -0,0 +1,41 @@
+import { TouchableOpacity } from 'react-native';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+import PoppinsText from './PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
+import React from 'react';
+
+interface ReturnProps {
+  onClose: () => void;
+}
+
+const Return: React.FC<ReturnProps> = ({ onClose }) => {
+  return (
+    <TouchableOpacity
+      onPress={onClose}
+      style={{
+        paddingVertical: 10,
+        flexDirection: 'row',
+        alignItems: 'center',
+      }}
+    >
+      <ChevronLeftIcon
+        width={16}
+        height={16}
+        color={Colors.primary}
+        style={{ marginRight: 2, marginLeft: 6 }}
+      />
+      <PoppinsText
+        weight="medium"
+        style={{
+          fontSize: FontSizes.b1.size,
+          lineHeight: FontSizes.b1.lineHeight,
+          color: Colors.primary,
+        }}
+      >
+        Volver
+      </PoppinsText>
+    </TouchableOpacity>
+  );
+};
+
+export default Return;
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
new file mode 100644
index 0000000..eb8e9af
--- /dev/null
+++ b/src/screens/ProfileScreen.tsx
@@ -0,0 +1,323 @@
+import React, { useEffect, useState } from 'react';
+import {
+  View,
+  Text,
+  StyleSheet,
+  TouchableOpacity,
+  ScrollView,
+} from 'react-native';
+import Avatar from '../components/Avatar';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Input from '../components/Input';
+import Button from '../components/Button';
+import { UserService } from '../services/user';
+import { UserList } from '../types/api';
+import { PencilIcon } from 'react-native-heroicons/outline';
+import Return from '../components/Return';
+import { useRouter } from 'expo-router';
+import DatePickerInput from '../components/DatePickerInput';
+import {
+  validateDateFormat,
+  validatePhoneNumberLength,
+  validateRequiredFields,
+} from '../utils/validators';
+import Alert from '../components/Alerts';
+
+const ProfileScreen = () => {
+  const [profile, setProfile] = useState<UserList>({});
+  const [isEditable, setIsEditable] = useState(false);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
+
+  /*   const formatDate = (dateString: string): string => {
+    const date = new Date(dateString);
+    const day = String(date.getDate()).padStart(2, '0');
+    const month = String(date.getMonth() + 1).padStart(2, '0');
+    const year = date.getFullYear();
+    return `${day}/${month}/${year}`;
+  }; */
+
+  useEffect(() => {
+    const fetchProfile = async () => {
+      try {
+        const profile = await UserService.getProfile();
+
+        if (profile.success) {
+          //profile.data.profile.birthDate = formatDate(profile.data.profile.birthDate);
+          setProfile(profile.data);
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    };
+
+    fetchProfile();
+  }, []);
+
+  const submitProfile = async () => {
+    if (
+      !validateRequiredFields([
+        profile.firstName,
+        profile.lastName,
+        profile.phoneNumber,
+        profile.profile?.birthDate,
+      ])
+    ) {
+      setShowErrorAlert(true);
+      setErrorMessage('Por favor completa todos los campos');
+      return;
+    }
+    if (!validateDateFormat(profile.profile?.birthDate)) {
+      setShowErrorAlert(true);
+      setErrorMessage('Formato de fecha inválido (Use YYYY-MM-DD)');
+      return;
+    }
+
+    // Validar que el teléfono tenga entre 8 y 15 caracteres
+    if (profile.phoneNumber.length < 8 || profile.phoneNumber.length > 15) {
+      setShowErrorAlert(true);
+      setErrorMessage(
+        'El número de teléfono debe tener entre 8 y 15 caracteres',
+      );
+      return;
+    }
+    setLoading(true);
+    try {
+      const updatedProfile = {
+        firstName: profile.firstName,
+        lastName: profile.lastName,
+        birthDate: profile.profile?.birthDate,
+        phoneNumber: profile.phoneNumber,
+        email: profile.email,
+      };
+
+      const response = await UserService.updateProfile(updatedProfile);
+
+      if (response.success) {
+        setIsEditable(false);
+        alert('Perfil actualizado exitosamente');
+      } else {
+        alert('Error al actualizar el perfil');
+      }
+      setLoading(false);
+    } catch (error) {
+      console.error('Error al actualizar el perfil:', error);
+      alert('Ocurrió un error al intentar actualizar el perfil');
+    }
+  };
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Cuenta creada correctamente"
+            onClose={() => {
+              setShowSuccessAlert(false);
+              router.replace('/success');
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      {/* Header con foto de perfil */}
+      <Return onClose={() => router.push('/')} />
+      <View style={styles.profileHeader}>
+        {isEditable ? (
+          <PoppinsText
+            style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}
+          >
+            Editar Perfil
+          </PoppinsText>
+        ) : (
+          <PoppinsText
+            style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}
+          >
+            Mi Perfil
+          </PoppinsText>
+        )}
+
+        <Avatar scale={80} />
+        {isEditable ? (
+          <TouchableOpacity
+            style={{
+              position: 'relative',
+              bottom: 20,
+              left: 25,
+              borderRadius: 100,
+              width: 30,
+              height: 30,
+              backgroundColor: Colors.primary,
+              justifyContent: 'center',
+              paddingStart: 5,
+            }}
+          >
+            <PencilIcon color={Colors.iconWhite} size={20} />
+          </TouchableOpacity>
+        ) : (
+          <TouchableOpacity
+            style={styles.editButton}
+            onPress={() => setIsEditable(true)}
+          >
+            <Text style={styles.editButtonText}>EDITAR</Text>
+          </TouchableOpacity>
+        )}
+      </View>
+
+      {/* Información del perfil */}
+      <View style={styles.profileInfo}>
+        <Input
+          label="Nombre"
+          value={profile?.firstName}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) => setProfile({ ...profile, firstName: value })}
+          errorText="El campo no puede estar vacío"
+        />
+        <Input
+          label="Apellido"
+          value={profile?.lastName}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) => setProfile({ ...profile, lastName: value })}
+          errorText="El campo no puede estar vacío"
+        />
+        <Input
+          label="Correo Electrónico"
+          value={profile?.email}
+          isEditable={false}
+          border={'none'}
+        />
+        <Input
+          label="Cédula"
+          value={profile?.documentId}
+          isEditable={false}
+          border={'none'}
+        />
+        {isEditable ? (
+          <DatePickerInput
+            label="Fecha de Nacimiento"
+            placeholder="Selecciona tu fecha"
+            value={profile?.profile?.birthDate}
+            getValue={(value) =>
+              setProfile({
+                ...profile,
+                profile: { ...profile.profile, birthDate: value },
+              })
+            }
+          />
+        ) : (
+          <Input
+            label="Fecha de nacimiento"
+            value={profile?.profile?.birthDate}
+            isEditable={isEditable}
+            border={isEditable ? 'default' : 'none'}
+          />
+        )}
+        <Input
+          label="Número de teléfono"
+          value={profile?.phoneNumber}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          validation={validatePhoneNumberLength}
+          getValue={(value) => setProfile({ ...profile, phoneNumber: value })}
+          fieldType="number"
+          errorText="El campo no puede estar vacío"
+        />
+      </View>
+
+      {/* Botón de editar al final */}
+      {!isEditable ? (
+        <Button title="Editar" onPress={() => setIsEditable(true)} />
+      ) : (
+        <Button
+          title="Guardar Cambios"
+          onPress={() => submitProfile()}
+          loading={loading}
+        />
+      )}
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: '#fff',
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  profileHeader: {
+    alignItems: 'center',
+    marginBottom: 15,
+  },
+  profileImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  profileInfo: {
+    marginBottom: 20,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
+
+export default ProfileScreen;
diff --git a/src/services/user.ts b/src/services/user.ts
index 12f3ca3..4baff1d 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,6 +1,6 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, UserList } from '../types/api.d';
+import { ServiceResponse, UpdateUser, UserList } from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
 
@@ -33,4 +33,35 @@ export const UserService = {
       };
     }
   },
+
+  updateProfile: async (
+    userData: Partial<UpdateUser>,
+  ): Promise<ServiceResponse<UserList>> => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+
+      // Llama al método `getProfile` del SDK con el userId y el token JWT
+      console.log(userId, userData, token);
+      const response = await api.user.update(userId, userData, token);
+      return { success: true, data: response };
+    } catch (error) {
+      console.error('Error updating profile:', error);
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 2fb6cf6..bf73b3f 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -77,6 +77,17 @@ type UserList = BaseModel & {
   profile: Profile;
 };
 
+type UpdateUser = {
+  firstName?: string;
+  lastName?: string;
+  phoneNumber?: string;
+  email: string;
+  profilePicture?: string;
+  birthDate: string;
+  gender?: UserGender;
+  role?: UserRole;
+};
+
 type State = {
   name: string;
 };

From ef9c769bf8ee35e0a59d6953aef0162c1c39c65d Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 6 Apr 2025 20:55:02 -0400
Subject: [PATCH 074/291] Implement logout functionality in SlideMenu and add
 confirmation popup; clean up TopBar component

---
 src/components/SlideMenu.tsx | 34 ++++++++++++++++++++++++++++++++++
 src/components/TopBar.tsx    |  3 ---
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/components/SlideMenu.tsx b/src/components/SlideMenu.tsx
index e5f799b..7852f2c 100644
--- a/src/components/SlideMenu.tsx
+++ b/src/components/SlideMenu.tsx
@@ -14,6 +14,9 @@ import { ChevronLeftIcon } from 'react-native-heroicons/solid';
 import Avatar from './Avatar';
 import { UserService } from '../services/user';
 import { ArrowUpTrayIcon } from 'react-native-heroicons/outline';
+import { AuthService } from '../services/auth';
+import { useRouter } from 'expo-router';
+import Popup from './Popup';
 
 const { width, height } = Dimensions.get('window');
 
@@ -38,6 +41,19 @@ const FullScreenSlideMenu: React.FC<FullScreenSlideMenuProps> = ({
   const [userName, setUserName] = React.useState('');
   const menuPosition = React.useRef(new Animated.Value(-width)).current;
   const [isActive, setIsActive] = React.useState('');
+  const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
+    React.useState(false);
+  const router = useRouter();
+
+  const handleLogout = async () => {
+    try {
+      await AuthService.logout(); // Llama al método logout del servicio de autenticación
+      setIsLogoutConfirmationVisible(false); // Cierra el popup de confirmación
+      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
+    } catch (error) {
+      console.error('Error al cerrar sesión:', error);
+    }
+  };
 
   React.useEffect(() => {
     Animated.timing(menuPosition, {
@@ -150,6 +166,7 @@ const FullScreenSlideMenu: React.FC<FullScreenSlideMenuProps> = ({
                   padding: 15,
                   alignContent: 'center',
                 }}
+                onPress={() => setIsLogoutConfirmationVisible(true)}
               >
                 <View>
                   <ArrowUpTrayIcon
@@ -169,6 +186,23 @@ const FullScreenSlideMenu: React.FC<FullScreenSlideMenuProps> = ({
         </SafeAreaView>
       </Animated.View>
 
+      {/* Popup for Logout Confirmation */}
+      <Popup
+        visible={isLogoutConfirmationVisible}
+        type="center"
+        headerText="Cerrar sesión"
+        bodyText="¿Estás seguro de que deseas cerrar sesión?"
+        primaryButton={{
+          text: 'Sí',
+          onPress: handleLogout,
+        }}
+        secondaryButton={{
+          text: 'No',
+          onPress: () => setIsLogoutConfirmationVisible(false),
+        }}
+        onClose={() => setIsLogoutConfirmationVisible(false)}
+      />
+
       {isOpen && (
         <TouchableOpacity
           style={styles.overlay}
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index 726fe03..8c36af0 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -46,9 +46,6 @@ const TopBar = () => {
         {/* Left user icon */}
         <View>
           <AvatarWithMenu />
-          {/* <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
-            <Avatar />
-          </TouchableOpacity> */}
         </View>
 
         {/* Logo */}

From 0fa396e23f4f8976f037709f605537f9079ddd88 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 6 Apr 2025 21:50:50 -0400
Subject: [PATCH 075/291] Add Direction screen and integrate with navigation;
 update AvatarWithMenu for direction access; enhance Profile screen with
 editable fields and background color adjustments; extend UserService to fetch
 user directions; define UserAddressResponse type.

---
 src/app/_layout.tsx               |   1 +
 src/app/direction.tsx             |   2 +
 src/components/AvatarWithMenu.tsx |   2 +-
 src/screens/DirectionScreen.tsx   | 216 ++++++++++++++++++++++++++++++
 src/screens/ProfileScreen.tsx     |  15 +--
 src/services/user.ts              |  35 ++++-
 src/types/api.d.ts                |  14 ++
 7 files changed, 273 insertions(+), 12 deletions(-)
 create mode 100644 src/app/direction.tsx
 create mode 100644 src/screens/DirectionScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index dac5c92..8f3a42b 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -69,6 +69,7 @@ export default function RootLayout() {
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen name="products" options={{ headerShown: false }} />
         <Stack.Screen name="profile" options={{ headerShown: false }} />
+        <Stack.Screen name="direction" options={{ headerShown: false }} />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/direction.tsx b/src/app/direction.tsx
new file mode 100644
index 0000000..4dbdacc
--- /dev/null
+++ b/src/app/direction.tsx
@@ -0,0 +1,2 @@
+import DirectionScreen from '../screens/DirectionScreen';
+export default DirectionScreen;
diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
index 8407423..b01b9d2 100644
--- a/src/components/AvatarWithMenu.tsx
+++ b/src/components/AvatarWithMenu.tsx
@@ -26,7 +26,7 @@ const AvatarWithMenu: React.FC = () => {
       id: '2',
       title: 'Mis Direcciones',
       icon: <MapIcon color={Colors.iconMainPrimary} />,
-      onPress: () => console.log('Configuración presionada'),
+      onPress: () => router.push('/direction'),
     },
     {
       id: '3',
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
new file mode 100644
index 0000000..c0db8a4
--- /dev/null
+++ b/src/screens/DirectionScreen.tsx
@@ -0,0 +1,216 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Input from '../components/Input';
+import Button from '../components/Button';
+import { UserService } from '../services/user';
+import { UserAddressResponse } from '../types/api';
+import {
+  MagnifyingGlassIcon,
+  PencilIcon,
+  TrashIcon,
+} from 'react-native-heroicons/outline';
+import Return from '../components/Return';
+import { useRouter } from 'expo-router';
+import Alert from '../components/Alerts';
+
+const DirectionScreen = () => {
+  const [searchDirection, setSearchDirection] = useState('');
+  const [directionsList, setDirectionList] = useState<
+    UserAddressResponse[] | undefined
+  >(undefined);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showInfoAlert, setShowInfoAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchDirection = async () => {
+      try {
+        const direction = await UserService.getUserDirections();
+
+        if (direction.success) {
+          if (direction.data.length > 0) {
+            setDirectionList(direction.data);
+          } else {
+            setShowInfoAlert(true);
+          }
+        }
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ha ocurrido un error');
+        setShowErrorAlert(true);
+      }
+    };
+
+    fetchDirection();
+  }, []);
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showInfoAlert && (
+          <Alert
+            type="info"
+            title="No tiene direcciones registradas"
+            message="No tiene direcciones registradas"
+            onClose={() => {
+              setShowInfoAlert(false);
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      {/* Header con foto de perfil */}
+      <Return onClose={() => router.push('/')} />
+      <View style={styles.directionHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}>
+          Mis Direcciones
+        </PoppinsText>
+      </View>
+
+      <View>
+        <Input
+          placeholder="Buscar direcciones"
+          value={searchDirection}
+          getValue={setSearchDirection}
+          icon={<MagnifyingGlassIcon color={Colors.gray_500} size={20} />}
+          backgroundColor={Colors.textWhite}
+        />
+      </View>
+
+      <View style={styles.directionInfo}>
+        {directionsList &&
+          directionsList.length > 0 &&
+          directionsList.map((direction, index) => (
+            <View
+              key={index}
+              style={{
+                flexDirection: 'row',
+                padding: 10,
+                borderBottomWidth: 1,
+                borderColor: Colors.gray_100,
+              }}
+            >
+              <View style={{ paddingVertical: 10 }}>
+                <PoppinsText>{direction.adress}, </PoppinsText>
+                <PoppinsText>
+                  {direction.nameCity}, {direction.nameState},{' '}
+                  {direction.zipCode}
+                </PoppinsText>
+                <PoppinsText>{direction.additionalInformation}</PoppinsText>
+                <PoppinsText>{direction.referencePoint}</PoppinsText>
+              </View>
+              <View
+                style={{
+                  flex: 1,
+                  flexDirection: 'row',
+                  justifyContent: 'space-evenly',
+                  alignItems: 'center',
+                }}
+              >
+                <TouchableOpacity
+                  onPress={() => router.push(`/editDirection/${direction.id}`)}
+                >
+                  <PencilIcon color={Colors.iconMainPrimary} size={20} />
+                </TouchableOpacity>
+                <TouchableOpacity
+                  onPress={() =>
+                    console.log(`Delete direction with id: ${direction.id}`)
+                  }
+                >
+                  <TrashIcon color={Colors.iconMainPrimary} size={20} />
+                </TouchableOpacity>
+              </View>
+            </View>
+          ))}
+      </View>
+
+      <Button
+        title="Agregar nueva dirección"
+        onPress={() => router.push('/editDirection')}
+      />
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  directionHeader: {
+    alignItems: 'center',
+    marginBottom: 15,
+  },
+  directionImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  directionInfo: {
+    marginVertical: 20,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+    borderRadius: 10,
+    backgroundColor: Colors.textWhite,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
+
+export default DirectionScreen;
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index eb8e9af..488e668 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -1,11 +1,5 @@
 import React, { useEffect, useState } from 'react';
-import {
-  View,
-  Text,
-  StyleSheet,
-  TouchableOpacity,
-  ScrollView,
-} from 'react-native';
+import { View, StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
 import Avatar from '../components/Avatar';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
@@ -174,7 +168,7 @@ const ProfileScreen = () => {
             style={styles.editButton}
             onPress={() => setIsEditable(true)}
           >
-            <Text style={styles.editButtonText}>EDITAR</Text>
+            <PoppinsText style={styles.editButtonText}>EDITAR</PoppinsText>
           </TouchableOpacity>
         )}
       </View>
@@ -188,6 +182,7 @@ const ProfileScreen = () => {
           border={isEditable ? 'default' : 'none'}
           getValue={(value) => setProfile({ ...profile, firstName: value })}
           errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
         />
         <Input
           label="Apellido"
@@ -196,6 +191,7 @@ const ProfileScreen = () => {
           border={isEditable ? 'default' : 'none'}
           getValue={(value) => setProfile({ ...profile, lastName: value })}
           errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
         />
         <Input
           label="Correo Electrónico"
@@ -238,6 +234,7 @@ const ProfileScreen = () => {
           getValue={(value) => setProfile({ ...profile, phoneNumber: value })}
           fieldType="number"
           errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
         />
       </View>
 
@@ -258,7 +255,7 @@ const ProfileScreen = () => {
 const styles = StyleSheet.create({
   container: {
     flexGrow: 1,
-    backgroundColor: '#fff',
+    backgroundColor: Colors.bgColor,
     padding: 20,
   },
   alertContainer: {
diff --git a/src/services/user.ts b/src/services/user.ts
index 4baff1d..e604662 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,6 +1,11 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, UpdateUser, UserList } from '../types/api.d';
+import {
+  ServiceResponse,
+  UpdateUser,
+  UserList,
+  UserAddressResponse,
+} from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
 
@@ -53,7 +58,6 @@ export const UserService = {
       const userId = decoded.userId;
 
       // Llama al método `getProfile` del SDK con el userId y el token JWT
-      console.log(userId, userData, token);
       const response = await api.user.update(userId, userData, token);
       return { success: true, data: response };
     } catch (error) {
@@ -64,4 +68,31 @@ export const UserService = {
       };
     }
   },
+
+  getUserDirections: async (): Promise<
+    ServiceResponse<UserAddressResponse[]>
+  > => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      const response = await api.userAdress.getListAddresses(userId, token);
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index bf73b3f..02f76db 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -88,6 +88,20 @@ type UpdateUser = {
   role?: UserRole;
 };
 
+type UserAddressResponse = {
+  adress: string;
+  zipCode: string;
+  latitude: number | null;
+  longitude: number | null;
+  cityId: string;
+  id: string;
+  additionalInformation: string | null;
+  referencePoint: string | null;
+  nameCity: string;
+  nameState: string;
+  nameCountry: string;
+};
+
 type State = {
   name: string;
 };

From c7b04b590386954033d035b7c171dde09fbcd1f4 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 7 Apr 2025 11:52:17 -0400
Subject: [PATCH 076/291] Eliminating unnecessary map load in branches screen

---
 src/screens/tab/BranchesScreen.tsx | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index b872621..682f44e 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -2,22 +2,11 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
-import MapViewComponent from '../../components/MapViewComponent';
 
 export default function BranchesScreen() {
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Sucursales</PoppinsText>
-      <View style={styles.mapContainer}>
-        <MapViewComponent
-          initialRegion={{
-            latitude: 37.7749,
-            longitude: -122.4194,
-            latitudeDelta: 0.0922,
-            longitudeDelta: 0.0421,
-          }}
-        />
-      </View>
     </View>
   );
 }
@@ -27,7 +16,4 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
-  mapContainer: {
-    flex: 1, // Asegura que el mapa ocupe todo el espacio disponible
-  },
 });

From 4b0a0474d100198d06d9c2a034cb95f9de815841 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 7 Apr 2025 11:54:19 -0400
Subject: [PATCH 077/291] Adding styles I forgot to put

---
 src/screens/tab/BranchesScreen.tsx | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index 682f44e..bc40068 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -14,6 +14,8 @@ export default function BranchesScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
     backgroundColor: Colors.bgColor,
   },
 });

From ac1893ba87edd624dbcd441b7aff4e3439dbe93e Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 8 Apr 2025 21:01:10 -0400
Subject: [PATCH 078/291] Adapting to new errors from backend

---
 package-lock.json              |  8 ++++----
 package.json                   |  2 +-
 src/screens/RegisterScreen.tsx |  4 ++--
 src/utils/errorHandler.ts      | 19 ++++++++++++++-----
 4 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 78a115d..7062877 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.3.10",
+        "@pharmatech/sdk": "^0.4.1",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3584,9 +3584,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.3.10",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.3.10.tgz",
-      "integrity": "sha512-2Tsh//MKp6a1WcvcmCZl8SnDQWaMcWqjB1QWtxI8uwgoElaiZkCfOC4eX3hY78tUypvl6tke4S5+M8e96kQz+Q==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
+      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 057c1de..024233c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.3.10",
+    "@pharmatech/sdk": "^0.4.1",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/screens/RegisterScreen.tsx b/src/screens/RegisterScreen.tsx
index 9b0d335..c255a48 100644
--- a/src/screens/RegisterScreen.tsx
+++ b/src/screens/RegisterScreen.tsx
@@ -195,12 +195,12 @@ export default function RegisterScreen() {
         }, 2000);
       } else {
         setShowErrorAlert(true);
-        setErrorMessage('Error al crear la cuenta, intenta de nuevo');
+        setErrorMessage(result.error); // Usamos el mensaje de error proporcionado por AuthService
       }
     } catch (error) {
       console.error(error);
       setShowErrorAlert(true);
-      setErrorMessage('Error al crear la cuenta, intenta de nuevo');
+      setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.'); // Mensaje genérico para errores no esperados
     } finally {
       setLoading(false);
     }
diff --git a/src/utils/errorHandler.ts b/src/utils/errorHandler.ts
index afc7a45..de6b2b9 100644
--- a/src/utils/errorHandler.ts
+++ b/src/utils/errorHandler.ts
@@ -1,17 +1,26 @@
-import type { ApiError } from '../types/api';
+import { isAPIError, APIError } from '@pharmatech/sdk';
 
-export const isApiError = (error: unknown): error is ApiError => {
-  return error instanceof Error && 'response' in error;
+/**
+ * Verifica si el error es del tipo APIError proporcionado por el SDK.
+ */
+export const isApiError = (error: unknown): error is APIError => {
+  return isAPIError(error); // Usa el método del SDK directamente
 };
 
+/**
+ * Extrae un mensaje de error legible para el usuario.
+ */
 export const extractErrorMessage = (error: unknown): string => {
   if (isApiError(error)) {
-    return error.response?.data?.detail || error.message;
+    // Si es un APIError, toma el primer mensaje de la lista
+    return error.messages[0] || 'Ocurrió un error desconocido en el servidor.';
   }
 
   if (error instanceof Error) {
+    // Si es un error genérico de JavaScript
     return error.message;
   }
 
-  return 'Error desconocido';
+  // Si no se puede identificar el error
+  return 'Ocurrió un error desconocido.';
 };

From c1bac3af8f547e8ce2a9847196fba0619ed03b6b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 9 Apr 2025 13:28:08 -0400
Subject: [PATCH 079/291] Creating RadioCard component

---
 src/components/RadioCard.tsx         | 91 ++++++++++++++++++++++++++++
 src/screens/tab/CategoriesScreen.tsx |  6 ++
 src/styles/theme.ts                  |  2 +
 3 files changed, 99 insertions(+)
 create mode 100644 src/components/RadioCard.tsx

diff --git a/src/components/RadioCard.tsx b/src/components/RadioCard.tsx
new file mode 100644
index 0000000..71fd702
--- /dev/null
+++ b/src/components/RadioCard.tsx
@@ -0,0 +1,91 @@
+import React, { useState } from 'react';
+import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+
+interface RadioCardProps {
+  label: string;
+  icon: React.ReactNode;
+}
+
+const RadioCard: React.FC<RadioCardProps> = ({ label, icon }) => {
+  const [selected, setSelected] = useState(false);
+
+  const handlePress = () => {
+    setSelected(!selected);
+  };
+
+  return (
+    <TouchableOpacity
+      style={[
+        styles.container,
+        selected ? styles.selectedContainer : styles.unselectedContainer,
+      ]}
+      onPress={handlePress}
+    >
+      <View style={styles.radioCircle}>
+        {selected && <View style={styles.radioCircleInner} />}
+      </View>
+      <Text
+        style={[
+          styles.label,
+          selected ? styles.selectedLabel : styles.unselectedLabel,
+        ]}
+      >
+        {label}
+      </Text>
+      <View style={styles.icon}>{icon}</View>
+    </TouchableOpacity>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    height: 70, // Altura estándar
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    borderWidth: 1,
+    width: '100%', // Asegura que ocupe todo el ancho disponible
+  },
+  selectedContainer: {
+    borderColor: Colors.primary_600,
+    backgroundColor: '#ECEFFA', // Color primario con opacidad (20%)
+  },
+  unselectedContainer: {
+    borderColor: Colors.gray_100,
+    backgroundColor: Colors.secondaryWhite,
+  },
+  radioCircle: {
+    width: 16,
+    height: 16,
+    borderRadius: 8,
+    borderWidth: 2,
+    borderColor: Colors.gray_100,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginRight: 12,
+  },
+  radioCircleInner: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    backgroundColor: Colors.secondaryWhite, // Círculo interno blanco
+  },
+  label: {
+    flex: 1,
+    fontSize: FontSizes.b1.size,
+    fontFamily: 'Poppins_500Medium',
+  },
+  selectedLabel: {
+    color: Colors.textMain,
+  },
+  unselectedLabel: {
+    color: Colors.textLowContrast,
+  },
+  icon: {
+    marginLeft: 12,
+  },
+});
+
+export default RadioCard;
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index cd7467f..abe4893 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -2,11 +2,17 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
+import RadioCard from '../../components/RadioCard';
+import { ShoppingBagIcon } from 'react-native-heroicons/outline';
 
 export default function CategoriesScreen() {
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Categorías</PoppinsText>
+      <RadioCard
+        label="Categoría 1"
+        icon={<ShoppingBagIcon color={Colors.textMain} />}
+      />
     </View>
   );
 }
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 458e3ff..7c10dd8 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -33,6 +33,8 @@ export const Colors = {
 
   yellow: '#FFBA2E0',
 
+  primary_600: '#415FCF',
+
   gray_100: '#E7E7E6',
   gray_500: '#6E6D6C',
 };

From 27e8d83b130473b91c89f5098ef05637cf2b90be Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 10 Apr 2025 22:41:48 -0400
Subject: [PATCH 080/291] Add checkout screen and order summary component;
 integrate radio card selection

---
 src/app/_layout.tsx                  |   4 +
 src/app/checkout.tsx                 |   3 +
 src/components/OrderSummary.tsx      | 258 +++++++++++++++++++++++++++
 src/components/RadioCard.tsx         |  28 +--
 src/screens/CartListScreen.tsx       |   4 +-
 src/screens/CheckoutScreen.tsx       |  74 ++++++++
 src/screens/tab/CategoriesScreen.tsx |   6 -
 7 files changed, 359 insertions(+), 18 deletions(-)
 create mode 100644 src/app/checkout.tsx
 create mode 100644 src/components/OrderSummary.tsx
 create mode 100644 src/screens/CheckoutScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 1b030f1..eb71f08 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -101,6 +101,10 @@ export default function RootLayout() {
           name="change-password"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="checkout"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
       </Stack>
     </Provider>
   );
diff --git a/src/app/checkout.tsx b/src/app/checkout.tsx
new file mode 100644
index 0000000..741cfb9
--- /dev/null
+++ b/src/app/checkout.tsx
@@ -0,0 +1,3 @@
+import CheckoutScreen from '../screens/CheckoutScreen';
+
+export default CheckoutScreen;
diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
new file mode 100644
index 0000000..5d4b233
--- /dev/null
+++ b/src/components/OrderSummary.tsx
@@ -0,0 +1,258 @@
+import React, { useState } from 'react';
+import {
+  View,
+  FlatList,
+  StyleSheet,
+  Image,
+  TouchableOpacity,
+} from 'react-native';
+import { useCart } from '../hooks/useCart';
+import PoppinsText from './PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
+import type { CartItem } from '../redux/slices/cartSlice';
+import { ChevronDownIcon, ChevronUpIcon } from 'react-native-heroicons/outline'; // Import Heroicons
+
+const OrderSummary = () => {
+  const { cartItems } = useCart();
+  const [isOpen, setIsOpen] = useState(false);
+
+  const subtotal = cartItems.reduce(
+    (sum, item) => sum + item.price * item.quantity,
+    0,
+  );
+  const totalDiscount = cartItems.reduce(
+    (sum, item) => sum + item.price * (item.quantity * 0.1),
+    0,
+  );
+  const iva = (subtotal - totalDiscount) * 0.12;
+
+  const renderItem = ({ item }: { item: CartItem }) => {
+    const discount = 10;
+    const discountedPrice = item.price * (1 - discount / 100);
+    const totalDiscountedPrice = discountedPrice * item.quantity;
+    const totalOriginalPrice = item.price * item.quantity;
+
+    return (
+      <View style={styles.card}>
+        <View style={styles.imageContainer}>
+          <View style={styles.discountBadge}>
+            <PoppinsText style={styles.discountBadgeText}>
+              -{discount}%
+            </PoppinsText>
+          </View>
+          <Image
+            source={{ uri: item.image }}
+            style={styles.productImage}
+            resizeMode="cover"
+          />
+        </View>
+        <View style={styles.detailsContainer}>
+          <View style={styles.row}>
+            <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
+            <PoppinsText style={styles.productTotalPrice}>
+              ${totalDiscountedPrice.toFixed(2)}
+            </PoppinsText>
+          </View>
+          <PoppinsText style={styles.productOriginalPrice}>
+            ${totalOriginalPrice.toFixed(2)}
+          </PoppinsText>
+          <PoppinsText style={styles.productPrice}>
+            (${item.price} c/u)
+          </PoppinsText>
+          <PoppinsText style={styles.productQuantity}>
+            Cantidad: {item.quantity}
+          </PoppinsText>
+        </View>
+      </View>
+    );
+  };
+
+  return (
+    <View style={styles.container}>
+      <TouchableOpacity
+        style={styles.dropdownHeaderContainer}
+        onPress={() => setIsOpen(!isOpen)}
+      >
+        <PoppinsText style={styles.dropdownHeader}>
+          Resumen del pedido
+        </PoppinsText>
+        {isOpen ? (
+          <ChevronUpIcon
+            size={24}
+            color={Colors.textMain}
+            style={styles.dropdownIcon}
+          />
+        ) : (
+          <ChevronDownIcon
+            size={24}
+            color={Colors.textMain}
+            style={styles.dropdownIcon}
+          />
+        )}
+      </TouchableOpacity>
+      {isOpen && (
+        <>
+          <FlatList
+            data={cartItems.filter((item) => item.quantity > 0)}
+            renderItem={renderItem}
+            keyExtractor={(item) => item.id}
+            contentContainerStyle={styles.listContainer}
+            showsVerticalScrollIndicator={false}
+          />
+          <View style={styles.footer}>
+            <View style={styles.row}>
+              <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
+              <PoppinsText style={styles.subtotalText}>
+                ${subtotal.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
+              <PoppinsText style={styles.discountText}>
+                -${totalDiscount.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
+              <PoppinsText style={styles.ivaText}>
+                ${iva.toFixed(2)}
+              </PoppinsText>
+            </View>
+          </View>
+        </>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    padding: 16,
+  },
+  dropdownHeaderContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 16,
+    width: '110%',
+    height: 46,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+  },
+  dropdownHeader: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+  },
+  dropdownIcon: {
+    marginLeft: 8,
+  },
+  listContainer: {
+    paddingBottom: 16,
+  },
+  card: {
+    flexDirection: 'row',
+    borderRadius: 8,
+    marginBottom: 24,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.gray_100,
+    paddingBottom: 18,
+  },
+  imageContainer: {
+    width: 100,
+    height: 100,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginRight: 16,
+  },
+  detailsContainer: {
+    flex: 1,
+  },
+  productName: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    width: '50%',
+  },
+  productPrice: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+    marginBottom: 2,
+  },
+  productTotalPrice: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 8,
+  },
+  productOriginalPrice: {
+    position: 'absolute',
+    right: 0,
+    top: 24,
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+    textDecorationLine: 'line-through',
+    marginBottom: 8,
+  },
+  discountBadge: {
+    zIndex: 999,
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    backgroundColor: Colors.semanticWarning,
+    borderRadius: 50,
+    paddingHorizontal: 6,
+    paddingVertical: 2,
+  },
+  discountBadgeText: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.primary,
+  },
+  footer: {
+    paddingTop: 16,
+  },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginBottom: 8,
+  },
+  subtotalText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+  },
+  discountText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.secondary,
+  },
+  ivaText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+  },
+  totalText: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
+  productImage: {
+    width: '100%',
+    height: '100%',
+    marginTop: 16,
+  },
+  productQuantity: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.textMain,
+    marginTop: 4,
+  },
+});
+
+export default OrderSummary;
diff --git a/src/components/RadioCard.tsx b/src/components/RadioCard.tsx
index 71fd702..d17f417 100644
--- a/src/components/RadioCard.tsx
+++ b/src/components/RadioCard.tsx
@@ -1,28 +1,34 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { View, Text, StyleSheet, TouchableOpacity } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 
 interface RadioCardProps {
   label: string;
   icon: React.ReactNode;
+  selected: boolean;
+  onPress: () => void;
 }
 
-const RadioCard: React.FC<RadioCardProps> = ({ label, icon }) => {
-  const [selected, setSelected] = useState(false);
-
-  const handlePress = () => {
-    setSelected(!selected);
-  };
-
+const RadioCard: React.FC<RadioCardProps> = ({
+  label,
+  icon,
+  selected,
+  onPress,
+}) => {
   return (
     <TouchableOpacity
       style={[
         styles.container,
         selected ? styles.selectedContainer : styles.unselectedContainer,
       ]}
-      onPress={handlePress}
+      onPress={onPress}
     >
-      <View style={styles.radioCircle}>
+      <View
+        style={[
+          styles.radioCircle,
+          selected && { borderColor: Colors.primary_600, borderWidth: 4 },
+        ]}
+      >
         {selected && <View style={styles.radioCircleInner} />}
       </View>
       <Text
@@ -60,7 +66,7 @@ const styles = StyleSheet.create({
     width: 16,
     height: 16,
     borderRadius: 8,
-    borderWidth: 2,
+    borderWidth: 1,
     borderColor: Colors.gray_100,
     justifyContent: 'center',
     alignItems: 'center',
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index baebc64..c84ae1a 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -146,7 +146,9 @@ const CartListScreen = () => {
             </View>
             <Button
               title="Ir a pagar"
-              onPress={() => {}}
+              onPress={() => {
+                router.push('/checkout');
+              }}
               style={styles.checkoutButton}
               size="medium"
             />
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
new file mode 100644
index 0000000..0f61c17
--- /dev/null
+++ b/src/screens/CheckoutScreen.tsx
@@ -0,0 +1,74 @@
+import React, { useState } from 'react';
+import { View, StyleSheet, TouchableOpacity, Text } from 'react-native';
+import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
+import { Colors, FontSizes } from '../styles/theme';
+import RadioCard from '../components/RadioCard';
+import OrderSummary from '../components/OrderSummary';
+
+const CheckoutScreen = () => {
+  const [selectedOption, setSelectedOption] = useState<
+    'pickup' | 'delivery' | null
+  >(null);
+
+  return (
+    <View style={styles.container}>
+      <View style={styles.radioContainer}>
+        <View style={styles.radioItem}>
+          <RadioCard
+            label="Retiro en Sucursal"
+            icon={<ShoppingBagIcon color={Colors.textMain} />}
+            selected={selectedOption === 'pickup'}
+            onPress={() => setSelectedOption('pickup')}
+          />
+        </View>
+        <View>
+          <RadioCard
+            label="Delivery"
+            icon={<TruckIcon color={Colors.textMain} />}
+            selected={selectedOption === 'delivery'}
+            onPress={() => setSelectedOption('delivery')}
+          />
+        </View>
+      </View>
+      <OrderSummary />
+      <TouchableOpacity
+        style={styles.continueButton}
+        onPress={() => console.log('Continuar pressed')}
+      >
+        <Text style={styles.continueButtonText}>Continuar</Text>
+      </TouchableOpacity>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    padding: 20,
+    backgroundColor: Colors.bgColor,
+  },
+  radioContainer: {
+    width: '100%',
+    marginBottom: 20,
+  },
+  radioItem: {
+    marginBottom: 24,
+  },
+  continueButton: {
+    width: '100%',
+    backgroundColor: Colors.primary,
+    paddingVertical: 12,
+    alignItems: 'center',
+    borderRadius: 4,
+    marginTop: 20,
+  },
+  continueButtonText: {
+    color: Colors.textWhite,
+    fontSize: FontSizes.b1.size,
+    fontFamily: 'Poppins_600SemiBold',
+  },
+});
+
+export default CheckoutScreen;
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index abe4893..cd7467f 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -2,17 +2,11 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
-import RadioCard from '../../components/RadioCard';
-import { ShoppingBagIcon } from 'react-native-heroicons/outline';
 
 export default function CategoriesScreen() {
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Categorías</PoppinsText>
-      <RadioCard
-        label="Categoría 1"
-        icon={<ShoppingBagIcon color={Colors.textMain} />}
-      />
     </View>
   );
 }

From 95eb21c0c745d13787b0bc89a3ff89d39ec2dc46 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 10 Apr 2025 23:09:27 -0400
Subject: [PATCH 081/291] Add total calculation and display in CheckoutScreen

---
 src/screens/CheckoutScreen.tsx | 43 +++++++++++++++++++++++++++++++++-
 1 file changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 0f61c17..4dfccd0 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -4,11 +4,24 @@ import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
+import { useCart } from '../hooks/useCart';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
   >(null);
+  const { cartItems } = useCart();
+
+  const subtotal = cartItems.reduce(
+    (sum, item) => sum + item.price * item.quantity,
+    0,
+  );
+  const totalDiscount = cartItems.reduce(
+    (sum, item) => sum + item.price * (item.quantity * 0.1),
+    0,
+  );
+  const iva = (subtotal - totalDiscount) * 0.12;
+  const total = subtotal - totalDiscount + iva;
 
   return (
     <View style={styles.container}>
@@ -31,6 +44,12 @@ const CheckoutScreen = () => {
         </View>
       </View>
       <OrderSummary />
+      <View style={styles.totalContainer}>
+        <View style={styles.totalRow}>
+          <Text style={styles.totalLabel}>Total:</Text>
+          <Text style={styles.totalAmount}>${total.toFixed(2)}</Text>
+        </View>
+      </View>
       <TouchableOpacity
         style={styles.continueButton}
         onPress={() => console.log('Continuar pressed')}
@@ -56,13 +75,35 @@ const styles = StyleSheet.create({
   radioItem: {
     marginBottom: 24,
   },
+  totalContainer: {
+    width: '110%',
+    marginTop: 20,
+    marginBottom: 10,
+    paddingHorizontal: 16,
+  },
+  totalRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    width: '100%',
+  },
+  totalLabel: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
+  totalAmount: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
   continueButton: {
     width: '100%',
     backgroundColor: Colors.primary,
     paddingVertical: 12,
     alignItems: 'center',
     borderRadius: 4,
-    marginTop: 20,
+    marginTop: 10,
   },
   continueButtonText: {
     color: Colors.textWhite,

From 2a80f2fd3dd3a6690f73aad8a83b8cec77f2ccf6 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 10 Apr 2025 23:40:54 -0400
Subject: [PATCH 082/291] Refactor CheckoutScreen to use Button component for
 'Continuar' action

---
 src/screens/CheckoutScreen.tsx | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 4dfccd0..1d34521 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,10 +1,11 @@
 import React, { useState } from 'react';
-import { View, StyleSheet, TouchableOpacity, Text } from 'react-native';
+import { View, StyleSheet, Text } from 'react-native';
 import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
 import { useCart } from '../hooks/useCart';
+import Button from '../components/Button';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
@@ -50,12 +51,7 @@ const CheckoutScreen = () => {
           <Text style={styles.totalAmount}>${total.toFixed(2)}</Text>
         </View>
       </View>
-      <TouchableOpacity
-        style={styles.continueButton}
-        onPress={() => console.log('Continuar pressed')}
-      >
-        <Text style={styles.continueButtonText}>Continuar</Text>
-      </TouchableOpacity>
+      <Button title="Continuar" size="medium" style={styles.checkoutButton} />
     </View>
   );
 };
@@ -110,6 +106,11 @@ const styles = StyleSheet.create({
     fontSize: FontSizes.b1.size,
     fontFamily: 'Poppins_600SemiBold',
   },
+  checkoutButton: {
+    marginBottom: 16,
+    width: '100%',
+    height: 50,
+  },
 });
 
 export default CheckoutScreen;

From e38112091e30945c52f41396d4bada301a3dcbb3 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 16:52:49 -0400
Subject: [PATCH 083/291] Add PaymentMethods component and integrate into
 CheckoutScreen

---
 src/components/OrderSummary.tsx   |  36 ++++-----
 src/components/PaymentMethods.tsx |  82 +++++++++++++++++++
 src/screens/CheckoutScreen.tsx    | 127 ++++++++++++++++++++----------
 3 files changed, 182 insertions(+), 63 deletions(-)
 create mode 100644 src/components/PaymentMethods.tsx

diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 5d4b233..2eee540 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -1,16 +1,10 @@
 import React, { useState } from 'react';
-import {
-  View,
-  FlatList,
-  StyleSheet,
-  Image,
-  TouchableOpacity,
-} from 'react-native';
+import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
 import { useCart } from '../hooks/useCart';
 import PoppinsText from './PoppinsText';
 import { Colors, FontSizes } from '../styles/theme';
 import type { CartItem } from '../redux/slices/cartSlice';
-import { ChevronDownIcon, ChevronUpIcon } from 'react-native-heroicons/outline'; // Import Heroicons
+import { ChevronDownIcon, ChevronUpIcon } from 'react-native-heroicons/outline';
 
 const OrderSummary = () => {
   const { cartItems } = useCart();
@@ -90,15 +84,19 @@ const OrderSummary = () => {
           />
         )}
       </TouchableOpacity>
+
       {isOpen && (
         <>
-          <FlatList
-            data={cartItems.filter((item) => item.quantity > 0)}
-            renderItem={renderItem}
-            keyExtractor={(item) => item.id}
-            contentContainerStyle={styles.listContainer}
-            showsVerticalScrollIndicator={false}
-          />
+          <View style={styles.listContainer}>
+            {cartItems
+              .filter((item) => item.quantity > 0)
+              .map((item) => (
+                <React.Fragment key={item.id}>
+                  {renderItem({ item })}
+                </React.Fragment>
+              ))}
+          </View>
+
           <View style={styles.footer}>
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
@@ -128,14 +126,13 @@ const OrderSummary = () => {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    padding: 16,
   },
   dropdownHeaderContainer: {
     flexDirection: 'row',
     justifyContent: 'space-between',
     alignItems: 'center',
     marginBottom: 16,
-    width: '110%',
+    width: '100%',
     height: 46,
     borderWidth: 1,
     borderColor: Colors.gray_100,
@@ -237,11 +234,6 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.b1.lineHeight,
     color: Colors.textMain,
   },
-  totalText: {
-    fontSize: FontSizes.h5.size,
-    lineHeight: FontSizes.h5.lineHeight,
-    color: Colors.textMain,
-  },
   productImage: {
     width: '100%',
     height: '100%',
diff --git a/src/components/PaymentMethods.tsx b/src/components/PaymentMethods.tsx
new file mode 100644
index 0000000..fbb0c2e
--- /dev/null
+++ b/src/components/PaymentMethods.tsx
@@ -0,0 +1,82 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import RadioButton from './RadioButton';
+import PoppinsText from './PoppinsText';
+import { Colors } from '../styles/theme';
+
+interface PaymentMethodsProps {
+  selectedOption: 'pickup' | 'delivery' | null;
+  selectedPayment:
+    | 'punto_de_venta'
+    | 'efectivo'
+    | 'transferencia'
+    | 'pago_movil'
+    | null;
+  setSelectedPayment: (
+    value: 'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil',
+  ) => void;
+}
+
+const PaymentMethods: React.FC<PaymentMethodsProps> = ({
+  selectedOption,
+  selectedPayment,
+  setSelectedPayment,
+}) => {
+  const paymentOptions = [
+    { label: 'Punto de Venta', value: 'punto_de_venta' },
+    { label: 'Efectivo', value: 'efectivo' },
+    { label: 'Transferencia Bancaria', value: 'transferencia' },
+    { label: 'Pago Móvil', value: 'pago_movil' },
+  ];
+
+  const filteredOptions = paymentOptions.filter((option) => {
+    if (selectedOption === 'pickup' && option.value === 'efectivo') {
+      return false;
+    }
+    if (selectedOption === 'delivery' && option.value === 'punto_de_venta') {
+      return false;
+    }
+    return true;
+  });
+
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.title}>
+        Seleccione el método de pago
+      </PoppinsText>
+      <View style={styles.divider} />
+      <View>
+        {filteredOptions.map((option) => (
+          <View key={option.value} style={styles.optionSpacing}>
+            <RadioButton
+              label={option.label}
+              value={option.value}
+              selectedValue={selectedPayment}
+              onValueChange={setSelectedPayment}
+            />
+          </View>
+        ))}
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    width: '100%',
+  },
+  title: {
+    color: Colors.gray_500,
+  },
+  divider: {
+    height: 1,
+    backgroundColor: Colors.gray_100,
+    marginVertical: 20,
+  },
+  optionSpacing: {
+    marginBottom: 10,
+    paddingLeft: 20,
+  },
+});
+
+export default PaymentMethods;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 1d34521..9b67e53 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,18 +1,34 @@
 import React, { useState } from 'react';
-import { View, StyleSheet, Text } from 'react-native';
+import { View, StyleSheet, Text, ScrollView } from 'react-native';
 import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
 import { useCart } from '../hooks/useCart';
 import Button from '../components/Button';
+import Steps from '../components/Steps';
+import PaymentMethods from '../components/PaymentMethods';
+import PoppinsText from '../components/PoppinsText';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
   >(null);
+  const [selectedPayment, setSelectedPayment] = useState<
+    'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil' | null
+  >(null);
   const { cartItems } = useCart();
 
+  const isSimplifiedSteps =
+    (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
+    (selectedOption === 'delivery' && selectedPayment === 'efectivo');
+
+  const stepsLabels = isSimplifiedSteps
+    ? ['Opciones de Compra', 'Confirmación de orden']
+    : ['Opciones de Compra', 'Visualización de datos', 'Confirmación de orden'];
+
+  const currentStep = 1;
+
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
@@ -24,43 +40,75 @@ const CheckoutScreen = () => {
   const iva = (subtotal - totalDiscount) * 0.12;
   const total = subtotal - totalDiscount + iva;
 
+  const renderFooterMessage = () => {
+    if (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') {
+      return 'Por favor dirigirse a su sucursal más cercana y pagar en el sitio. La orden estará en proceso de pago hasta que pague en el sitio.';
+    }
+    if (selectedOption === 'delivery' && selectedPayment === 'efectivo') {
+      return 'Debe pagar al personal del delivery la cantidad exacta de su pedido. La orden estará en proceso de pago hasta que pague en el sitio.';
+    }
+    return null;
+  };
+
   return (
-    <View style={styles.container}>
-      <View style={styles.radioContainer}>
-        <View style={styles.radioItem}>
-          <RadioCard
-            label="Retiro en Sucursal"
-            icon={<ShoppingBagIcon color={Colors.textMain} />}
-            selected={selectedOption === 'pickup'}
-            onPress={() => setSelectedOption('pickup')}
-          />
+    <ScrollView contentContainerStyle={styles.scrollContainer}>
+      <View style={styles.container}>
+        <Steps
+          totalSteps={stepsLabels.length}
+          currentStep={currentStep}
+          labels={stepsLabels}
+        />
+        <PoppinsText style={styles.purchaseOptionsTitle}>
+          Opciones de Compra
+        </PoppinsText>
+        <View style={styles.radioContainer}>
+          <View style={styles.radioItem}>
+            <RadioCard
+              label="Retiro en Sucursal"
+              icon={<ShoppingBagIcon color={Colors.textMain} />}
+              selected={selectedOption === 'pickup'}
+              onPress={() => setSelectedOption('pickup')}
+            />
+          </View>
+          <View>
+            <RadioCard
+              label="Delivery"
+              icon={<TruckIcon color={Colors.textMain} />}
+              selected={selectedOption === 'delivery'}
+              onPress={() => setSelectedOption('delivery')}
+            />
+          </View>
         </View>
-        <View>
-          <RadioCard
-            label="Delivery"
-            icon={<TruckIcon color={Colors.textMain} />}
-            selected={selectedOption === 'delivery'}
-            onPress={() => setSelectedOption('delivery')}
-          />
-        </View>
-      </View>
-      <OrderSummary />
-      <View style={styles.totalContainer}>
-        <View style={styles.totalRow}>
-          <Text style={styles.totalLabel}>Total:</Text>
-          <Text style={styles.totalAmount}>${total.toFixed(2)}</Text>
+        <PaymentMethods
+          selectedOption={selectedOption}
+          selectedPayment={selectedPayment}
+          setSelectedPayment={setSelectedPayment}
+        />
+
+        {renderFooterMessage() && (
+          <Text style={styles.footerMessage}>{renderFooterMessage()}</Text>
+        )}
+        <OrderSummary />
+        <View style={styles.totalContainer}>
+          <View style={styles.totalRow}>
+            <Text style={styles.totalLabel}>Total:</Text>
+            <Text style={styles.totalAmount}>${total.toFixed(2)}</Text>
+          </View>
         </View>
+        <Button title="Continuar" size="medium" style={styles.checkoutButton} />
       </View>
-      <Button title="Continuar" size="medium" style={styles.checkoutButton} />
-    </View>
+    </ScrollView>
   );
 };
 
 const styles = StyleSheet.create({
+  scrollContainer: {
+    flexGrow: 1,
+  },
   container: {
     flex: 1,
     justifyContent: 'center',
-    alignItems: 'center',
+    alignItems: 'flex-start',
     padding: 20,
     backgroundColor: Colors.bgColor,
   },
@@ -72,10 +120,9 @@ const styles = StyleSheet.create({
     marginBottom: 24,
   },
   totalContainer: {
-    width: '110%',
+    width: '100%',
     marginTop: 20,
     marginBottom: 10,
-    paddingHorizontal: 16,
   },
   totalRow: {
     flexDirection: 'row',
@@ -93,24 +140,22 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
   },
-  continueButton: {
-    width: '100%',
-    backgroundColor: Colors.primary,
-    paddingVertical: 12,
-    alignItems: 'center',
-    borderRadius: 4,
-    marginTop: 10,
-  },
-  continueButtonText: {
-    color: Colors.textWhite,
-    fontSize: FontSizes.b1.size,
-    fontFamily: 'Poppins_600SemiBold',
+  footerMessage: {
+    fontSize: FontSizes.c1.size,
+    color: Colors.textLowContrast,
+    marginBottom: 20,
   },
   checkoutButton: {
     marginBottom: 16,
     width: '100%',
     height: 50,
   },
+  purchaseOptionsTitle: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    marginBottom: 24,
+    alignSelf: 'flex-start',
+  },
 });
 
 export default CheckoutScreen;

From 02422677396ba908297bb8df746626415e7ce9a1 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 16:57:00 -0400
Subject: [PATCH 084/291] Refactor CheckoutScreen to use PoppinsText for footer
 and total display

---
 src/components/Coupon.tsx      |  0
 src/screens/CheckoutScreen.tsx | 12 ++++++++----
 2 files changed, 8 insertions(+), 4 deletions(-)
 create mode 100644 src/components/Coupon.tsx

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
new file mode 100644
index 0000000..e69de29
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 9b67e53..0354b6f 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,5 +1,5 @@
 import React, { useState } from 'react';
-import { View, StyleSheet, Text, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView } from 'react-native';
 import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
@@ -86,13 +86,17 @@ const CheckoutScreen = () => {
         />
 
         {renderFooterMessage() && (
-          <Text style={styles.footerMessage}>{renderFooterMessage()}</Text>
+          <PoppinsText style={styles.footerMessage}>
+            {renderFooterMessage()}
+          </PoppinsText>
         )}
         <OrderSummary />
         <View style={styles.totalContainer}>
           <View style={styles.totalRow}>
-            <Text style={styles.totalLabel}>Total:</Text>
-            <Text style={styles.totalAmount}>${total.toFixed(2)}</Text>
+            <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+            <PoppinsText style={styles.totalAmount}>
+              ${total.toFixed(2)}
+            </PoppinsText>
           </View>
         </View>
         <Button title="Continuar" size="medium" style={styles.checkoutButton} />

From 3af2888baf70c46d6a833a2b89cfa66a03e921f3 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 17:52:28 -0400
Subject: [PATCH 085/291] Add Coupon component to CheckoutScreen for applying
 discount codes

---
 src/components/Coupon.tsx      | 89 ++++++++++++++++++++++++++++++++++
 src/screens/CheckoutScreen.tsx |  5 +-
 2 files changed, 92 insertions(+), 2 deletions(-)

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index e69de29..856ca4f 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -0,0 +1,89 @@
+import React, { useState } from 'react';
+import { View, StyleSheet } from 'react-native';
+import Input from './Input';
+import Button from './Button';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+
+interface CouponProps {
+  onApplyCoupon: (code: string) => void;
+  isLoading?: boolean;
+}
+
+const Coupon: React.FC<CouponProps> = ({
+  onApplyCoupon,
+  isLoading = false,
+}) => {
+  const [couponCode, setCouponCode] = useState('');
+
+  const handleApply = () => {
+    if (couponCode.trim().length > 0) {
+      onApplyCoupon(couponCode.trim());
+    }
+  };
+
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.label}>Ingresa el Cupón</PoppinsText>
+      <View style={styles.row}>
+        <View
+          style={[
+            styles.inputWrapper,
+            {
+              borderColor: Colors.gray_100,
+              borderWidth: 1,
+              borderRadius: 8,
+              height: 44,
+              paddingHorizontal: 10,
+              justifyContent: 'center',
+              backgroundColor: Colors.menuWhite,
+            },
+          ]}
+        >
+          <Input
+            placeholder="Código de Cupón"
+            value={couponCode}
+            getValue={(text) => setCouponCode(text)}
+            border="none"
+            backgroundColor="none"
+          />
+        </View>
+        <Button
+          title="Aplicar"
+          onPress={handleApply}
+          variant="primary"
+          size="medium"
+          loading={isLoading}
+          style={styles.button}
+        />
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    width: '100%',
+    marginVertical: 8,
+  },
+  label: {
+    color: Colors.textMain,
+    fontSize: FontSizes.b4.size,
+    marginBottom: 4,
+  },
+  row: {
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  inputWrapper: {
+    flex: 0.8,
+    marginRight: 8,
+  },
+  button: {
+    flex: 0.2,
+    height: 44,
+    paddingHorizontal: 16,
+  },
+});
+
+export default Coupon;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 0354b6f..aa07872 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -9,6 +9,7 @@ import Button from '../components/Button';
 import Steps from '../components/Steps';
 import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
+import Coupon from '../components/Coupon';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
@@ -84,13 +85,13 @@ const CheckoutScreen = () => {
           selectedPayment={selectedPayment}
           setSelectedPayment={setSelectedPayment}
         />
-
+        <Coupon onApplyCoupon={(code) => console.log('Cupon aplicado', code)} />
+        <OrderSummary />
         {renderFooterMessage() && (
           <PoppinsText style={styles.footerMessage}>
             {renderFooterMessage()}
           </PoppinsText>
         )}
-        <OrderSummary />
         <View style={styles.totalContainer}>
           <View style={styles.totalRow}>
             <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>

From 68612fbcf3c12d5838da6d5f96ebae9b817d11f7 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 21:17:47 -0400
Subject: [PATCH 086/291] Add LocationSelector component to CheckoutScreen for
 selecting pickup or delivery options

---
 src/components/LocationSelector.tsx | 57 ++++++++++++++++++++
 src/screens/CheckoutScreen.tsx      | 84 +++++++++++++++++++++--------
 2 files changed, 118 insertions(+), 23 deletions(-)
 create mode 100644 src/components/LocationSelector.tsx

diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
new file mode 100644
index 0000000..5097b62
--- /dev/null
+++ b/src/components/LocationSelector.tsx
@@ -0,0 +1,57 @@
+import { View, StyleSheet } from 'react-native';
+import Dropdown from './Dropdown';
+import PoppinsText from './PoppinsText';
+import { Colors } from '../styles/theme';
+
+const LocationSelector = ({
+  selectedOption,
+  onSelect,
+}: {
+  selectedOption: 'pickup' | 'delivery' | null;
+  onSelect: (value: string) => void;
+}) => {
+  const pickupData = [
+    { label: 'Sucursal 1', value: '1' },
+    { label: 'Sucursal 2', value: '2' },
+    { label: 'Sucursal 3', value: '3' },
+  ].map((item) => item.label);
+
+  const deliveryData = [
+    { label: 'Dirección 1', value: '1' },
+    { label: 'Dirección 2', value: '2' },
+    { label: 'Dirección 3', value: '3' },
+  ].map((item) => item.label);
+
+  const options = selectedOption === 'pickup' ? pickupData : deliveryData;
+
+  if (!selectedOption) return null;
+
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.label}>
+        {selectedOption === 'pickup'
+          ? 'Seleccione la sucursal'
+          : 'Seleccione la dirección de entrega'}
+      </PoppinsText>
+      <Dropdown
+        options={options}
+        placeholder="Selecciona una opción"
+        onSelect={(val) => onSelect(val)}
+        borderColor={Colors.gray_100}
+      />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 20,
+    width: '100%',
+  },
+  label: {
+    marginBottom: 8,
+    color: Colors.textMain,
+  },
+});
+
+export default LocationSelector;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index aa07872..dc800a3 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -10,11 +10,12 @@ import Steps from '../components/Steps';
 import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
 import Coupon from '../components/Coupon';
+import LocationSelector from '../components/LocationSelector';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
-  >(null);
+  >('pickup');
   const [selectedPayment, setSelectedPayment] = useState<
     'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil' | null
   >(null);
@@ -54,11 +55,13 @@ const CheckoutScreen = () => {
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
-        <Steps
-          totalSteps={stepsLabels.length}
-          currentStep={currentStep}
-          labels={stepsLabels}
-        />
+        <View style={styles.steps}>
+          <Steps
+            totalSteps={stepsLabels.length}
+            currentStep={currentStep}
+            labels={stepsLabels}
+          />
+        </View>
         <PoppinsText style={styles.purchaseOptionsTitle}>
           Opciones de Compra
         </PoppinsText>
@@ -80,27 +83,42 @@ const CheckoutScreen = () => {
             />
           </View>
         </View>
-        <PaymentMethods
+        <LocationSelector
           selectedOption={selectedOption}
-          selectedPayment={selectedPayment}
-          setSelectedPayment={setSelectedPayment}
+          onSelect={(val) => console.log('Seleccionado:', val)}
         />
-        <Coupon onApplyCoupon={(code) => console.log('Cupon aplicado', code)} />
-        <OrderSummary />
+        <View style={styles.paymentMethods}>
+          <PaymentMethods
+            selectedOption={selectedOption}
+            selectedPayment={selectedPayment}
+            setSelectedPayment={setSelectedPayment}
+          />
+        </View>
         {renderFooterMessage() && (
           <PoppinsText style={styles.footerMessage}>
             {renderFooterMessage()}
           </PoppinsText>
         )}
-        <View style={styles.totalContainer}>
-          <View style={styles.totalRow}>
-            <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-            <PoppinsText style={styles.totalAmount}>
-              ${total.toFixed(2)}
-            </PoppinsText>
+        <View style={styles.whiteBackgroundContainer}>
+          <Coupon
+            onApplyCoupon={(code) => console.log('Cupon aplicado:', code)}
+          />
+          <View style={styles.spacer} />
+          <OrderSummary />
+          <View style={styles.totalContainer}>
+            <View style={styles.totalRow}>
+              <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+              <PoppinsText style={styles.totalAmount}>
+                ${total.toFixed(2)}
+              </PoppinsText>
+            </View>
           </View>
+          <Button
+            title="Continuar"
+            size="medium"
+            style={styles.checkoutButton}
+          />
         </View>
-        <Button title="Continuar" size="medium" style={styles.checkoutButton} />
       </View>
     </ScrollView>
   );
@@ -112,14 +130,13 @@ const styles = StyleSheet.create({
   },
   container: {
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'flex-start',
-    padding: 20,
     backgroundColor: Colors.bgColor,
   },
+
   radioContainer: {
     width: '100%',
-    marginBottom: 20,
+    padding: 20,
+    marginTop: -30,
   },
   radioItem: {
     marginBottom: 24,
@@ -148,18 +165,39 @@ const styles = StyleSheet.create({
   footerMessage: {
     fontSize: FontSizes.c1.size,
     color: Colors.textLowContrast,
-    marginBottom: 20,
+    marginBottom: -20,
+    padding: 20,
+    marginTop: -20,
   },
   checkoutButton: {
     marginBottom: 16,
     width: '100%',
     height: 50,
+    marginTop: 15,
   },
   purchaseOptionsTitle: {
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
     marginBottom: 24,
     alignSelf: 'flex-start',
+    padding: 20,
+  },
+  whiteBackgroundContainer: {
+    backgroundColor: '#FFFFFF',
+    width: '100%',
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    marginTop: 20,
+    padding: 20,
+  },
+  paymentMethods: {
+    padding: 20,
+  },
+  steps: {
+    marginTop: 40,
+  },
+  spacer: {
+    height: 20,
   },
 });
 

From 069a4354561cc26b048ad67e465a3102659720df Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 22:44:18 -0400
Subject: [PATCH 087/291] Add PaymentInfoForm component to CheckoutScreen for
 payment method details

---
 src/components/PaymentInfoForm.tsx | 147 +++++++++++++++++++++++++
 src/screens/CheckoutScreen.tsx     | 169 +++++++++++++++++------------
 2 files changed, 249 insertions(+), 67 deletions(-)
 create mode 100644 src/components/PaymentInfoForm.tsx

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
new file mode 100644
index 0000000..1a08be8
--- /dev/null
+++ b/src/components/PaymentInfoForm.tsx
@@ -0,0 +1,147 @@
+// components/PaymentInfoForm.tsx
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import PoppinsText from './PoppinsText';
+import Input from './Input';
+import { FontSizes, Colors } from '../styles/theme';
+
+const PaymentInfoForm = ({
+  paymentMethod,
+  total,
+}: {
+  paymentMethod:
+    | 'punto_de_venta'
+    | 'efectivo'
+    | 'transferencia'
+    | 'pago_movil'
+    | null;
+  total: string;
+}) => {
+  if (!paymentMethod) {
+    return null;
+  }
+  return (
+    <View style={styles.container}>
+      {paymentMethod === 'pago_movil' && (
+        <>
+          <PoppinsText style={styles.label}>
+            Realiza el pago en la siguiente cuenta de Pharmatech
+          </PoppinsText>
+          <PoppinsText style={styles.label1}>
+            Debes hacer el pago del monto exacto, de lo contrario no se creará
+            la orden
+          </PoppinsText>
+
+          <View style={styles.row}>
+            <View style={styles.inputWrapper}>
+              <Input
+                label="Banco Asociado"
+                value="Banco Venezuela"
+                isEditable={false}
+              />
+            </View>
+            <View style={styles.inputWrapper}>
+              <Input label="Teléfono" value="0414-1234567" isEditable={false} />
+            </View>
+          </View>
+
+          <View style={styles.row}>
+            <View style={styles.inputWrapper}>
+              <Input label="RIF" value="J-008720001" isEditable={false} />
+            </View>
+            <View style={styles.inputWrapper}>
+              <Input label="Monto" value={total} isEditable={false} />
+            </View>
+          </View>
+
+          <PoppinsText style={styles.label}>
+            Ingrese los datos para validar el pago
+          </PoppinsText>
+          <Input label="Banco" placeholder="Ingrese el banco" />
+          <Input label="Referencia" placeholder="Ingrese la referencia" />
+          <Input
+            label="Número de documento"
+            placeholder="Ingrese su número de documento"
+          />
+          <Input label="Teléfono" placeholder="Ingrese su número de teléfono" />
+        </>
+      )}
+
+      {paymentMethod === 'transferencia' && (
+        <>
+          <PoppinsText style={styles.label}>
+            Realiza el pago en la siguiente cuenta de Pharmatech
+          </PoppinsText>
+          <PoppinsText style={styles.label1}>
+            Debes hacer el pago del monto exacto, de lo contrario no se creará
+            la orden
+          </PoppinsText>
+
+          <View style={styles.row}>
+            <View style={styles.inputWrapper}>
+              <Input
+                label="Banco Asociado"
+                value="Banco Venezuela"
+                isEditable={false}
+              />
+            </View>
+            <View style={styles.inputWrapper}>
+              <Input
+                label="Cuenta"
+                value="0134-2452-30-2536432346"
+                isEditable={false}
+              />
+            </View>
+          </View>
+
+          <View style={styles.row}>
+            <View style={styles.inputWrapper}>
+              <Input label="RIF" value="J-008720001" isEditable={false} />
+            </View>
+            <View style={styles.inputWrapper}>
+              <Input label="Monto" value={total} isEditable={false} />
+            </View>
+          </View>
+
+          <PoppinsText style={styles.label}>
+            Ingrese los datos para validar el pago
+          </PoppinsText>
+          <Input label="Banco" placeholder="Ingrese el banco" />
+          <Input label="Referencia" placeholder="Ingrese la referencia" />
+          <Input
+            label="Número de documento"
+            placeholder="Ingrese su número de documento"
+          />
+          <Input label="Teléfono" placeholder="Ingrese su número de teléfono" />
+        </>
+      )}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    marginTop: 20,
+  },
+  label: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textMain,
+    marginBottom: 10,
+  },
+  label1: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.gray_500,
+    marginBottom: 10,
+  },
+  row: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    gap: 12,
+    marginBottom: 18,
+  },
+  inputWrapper: {
+    flex: 1,
+  },
+});
+
+export default PaymentInfoForm;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index dc800a3..e597a96 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -11,6 +11,7 @@ import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
 import Coupon from '../components/Coupon';
 import LocationSelector from '../components/LocationSelector';
+import PaymentInfoForm from '../components/PaymentInfoForm';
 
 const CheckoutScreen = () => {
   const [selectedOption, setSelectedOption] = useState<
@@ -19,6 +20,7 @@ const CheckoutScreen = () => {
   const [selectedPayment, setSelectedPayment] = useState<
     'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil' | null
   >(null);
+  const [currentStep, setCurrentStep] = useState(1);
   const { cartItems } = useCart();
 
   const isSimplifiedSteps =
@@ -29,8 +31,6 @@ const CheckoutScreen = () => {
     ? ['Opciones de Compra', 'Confirmación de orden']
     : ['Opciones de Compra', 'Visualización de datos', 'Confirmación de orden'];
 
-  const currentStep = 1;
-
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
@@ -52,6 +52,12 @@ const CheckoutScreen = () => {
     return null;
   };
 
+  const handleContinue = () => {
+    if (currentStep < stepsLabels.length) {
+      setCurrentStep(currentStep + 1);
+    }
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
@@ -62,43 +68,65 @@ const CheckoutScreen = () => {
             labels={stepsLabels}
           />
         </View>
-        <PoppinsText style={styles.purchaseOptionsTitle}>
-          Opciones de Compra
-        </PoppinsText>
-        <View style={styles.radioContainer}>
-          <View style={styles.radioItem}>
-            <RadioCard
-              label="Retiro en Sucursal"
-              icon={<ShoppingBagIcon color={Colors.textMain} />}
-              selected={selectedOption === 'pickup'}
-              onPress={() => setSelectedOption('pickup')}
-            />
-          </View>
-          <View>
-            <RadioCard
-              label="Delivery"
-              icon={<TruckIcon color={Colors.textMain} />}
-              selected={selectedOption === 'delivery'}
-              onPress={() => setSelectedOption('delivery')}
+
+        {currentStep === 1 && (
+          <>
+            <PoppinsText style={styles.purchaseOptionsTitle}>
+              Opciones de Compra
+            </PoppinsText>
+            <View style={styles.radioContainer}>
+              <View style={styles.radioItem}>
+                <RadioCard
+                  label="Retiro en Sucursal"
+                  icon={<ShoppingBagIcon color={Colors.textMain} />}
+                  selected={selectedOption === 'pickup'}
+                  onPress={() => setSelectedOption('pickup')}
+                />
+              </View>
+              <View>
+                <RadioCard
+                  label="Delivery"
+                  icon={<TruckIcon color={Colors.textMain} />}
+                  selected={selectedOption === 'delivery'}
+                  onPress={() => setSelectedOption('delivery')}
+                />
+              </View>
+            </View>
+            <LocationSelector
+              selectedOption={selectedOption}
+              onSelect={(val) => console.log('Seleccionado:', val)}
             />
-          </View>
-        </View>
-        <LocationSelector
-          selectedOption={selectedOption}
-          onSelect={(val) => console.log('Seleccionado:', val)}
-        />
-        <View style={styles.paymentMethods}>
-          <PaymentMethods
-            selectedOption={selectedOption}
-            selectedPayment={selectedPayment}
-            setSelectedPayment={setSelectedPayment}
-          />
-        </View>
-        {renderFooterMessage() && (
-          <PoppinsText style={styles.footerMessage}>
-            {renderFooterMessage()}
-          </PoppinsText>
+            <View style={styles.paymentMethods}>
+              <PaymentMethods
+                selectedOption={selectedOption}
+                selectedPayment={selectedPayment}
+                setSelectedPayment={setSelectedPayment}
+              />
+            </View>
+            {renderFooterMessage() && (
+              <PoppinsText style={styles.footerMessage}>
+                {renderFooterMessage()}
+              </PoppinsText>
+            )}
+          </>
+        )}
+
+        {currentStep === 2 && !isSimplifiedSteps && (
+          <>
+            <PoppinsText
+              style={[styles.purchaseOptionsTitle, styles.step2Title]}
+            >
+              Visualización de datos
+            </PoppinsText>
+            <View style={styles.paymentInfoFormContainer}>
+              <PaymentInfoForm
+                paymentMethod={selectedPayment}
+                total={total.toFixed(2)}
+              />
+            </View>
+          </>
         )}
+
         <View style={styles.whiteBackgroundContainer}>
           <Coupon
             onApplyCoupon={(code) => console.log('Cupon aplicado:', code)}
@@ -114,9 +142,10 @@ const CheckoutScreen = () => {
             </View>
           </View>
           <Button
-            title="Continuar"
+            title={currentStep < stepsLabels.length ? 'Continuar' : 'Finalizar'}
             size="medium"
             style={styles.checkoutButton}
+            onPress={handleContinue}
           />
         </View>
       </View>
@@ -132,7 +161,16 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
-
+  steps: {
+    marginTop: 40,
+  },
+  purchaseOptionsTitle: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    marginBottom: 24,
+    alignSelf: 'flex-start',
+    padding: 20,
+  },
   radioContainer: {
     width: '100%',
     padding: 20,
@@ -141,6 +179,27 @@ const styles = StyleSheet.create({
   radioItem: {
     marginBottom: 24,
   },
+  paymentMethods: {
+    padding: 20,
+  },
+  footerMessage: {
+    fontSize: FontSizes.c1.size,
+    color: Colors.textLowContrast,
+    marginBottom: -20,
+    padding: 20,
+    marginTop: -20,
+  },
+  whiteBackgroundContainer: {
+    backgroundColor: '#FFFFFF',
+    width: '100%',
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    marginTop: 20,
+    padding: 20,
+  },
+  spacer: {
+    height: 20,
+  },
   totalContainer: {
     width: '100%',
     marginTop: 20,
@@ -162,42 +221,18 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
   },
-  footerMessage: {
-    fontSize: FontSizes.c1.size,
-    color: Colors.textLowContrast,
-    marginBottom: -20,
-    padding: 20,
-    marginTop: -20,
-  },
   checkoutButton: {
     marginBottom: 16,
     width: '100%',
     height: 50,
     marginTop: 15,
   },
-  purchaseOptionsTitle: {
-    fontSize: FontSizes.h5.size,
-    color: Colors.textMain,
-    marginBottom: 24,
-    alignSelf: 'flex-start',
-    padding: 20,
-  },
-  whiteBackgroundContainer: {
-    backgroundColor: '#FFFFFF',
-    width: '100%',
-    borderTopLeftRadius: 16,
-    borderTopRightRadius: 16,
-    marginTop: 20,
-    padding: 20,
+  step2Title: {
+    marginBottom: -20,
   },
-  paymentMethods: {
+  paymentInfoFormContainer: {
     padding: 20,
-  },
-  steps: {
-    marginTop: 40,
-  },
-  spacer: {
-    height: 20,
+    paddingTop: 0,
   },
 });
 

From 9e95ba61f6d024effbf954297b2dd78bc6c6769e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 11 Apr 2025 22:51:07 -0400
Subject: [PATCH 088/291] Fix PaymentMethods component to handle selected
 payment value correctly

---
 src/components/PaymentMethods.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/components/PaymentMethods.tsx b/src/components/PaymentMethods.tsx
index fbb0c2e..dae863c 100644
--- a/src/components/PaymentMethods.tsx
+++ b/src/components/PaymentMethods.tsx
@@ -51,8 +51,16 @@ const PaymentMethods: React.FC<PaymentMethodsProps> = ({
             <RadioButton
               label={option.label}
               value={option.value}
-              selectedValue={selectedPayment}
-              onValueChange={setSelectedPayment}
+              selectedValue={selectedPayment || ''}
+              onValueChange={(value) =>
+                setSelectedPayment(
+                  value as
+                    | 'punto_de_venta'
+                    | 'efectivo'
+                    | 'transferencia'
+                    | 'pago_movil',
+                )
+              } // Explicitly cast the value
             />
           </View>
         ))}

From dd709f2a35d0fbde66b8cf8780e1bcb25b3ab843 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 12 Apr 2025 10:16:38 -0400
Subject: [PATCH 089/291] Refactor CheckoutScreen to streamline state
 management and improve button enablement logic

---
 src/screens/CheckoutScreen.tsx | 31 +++++++++++++++++++++++++++----
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index e597a96..4693d5f 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,3 +1,4 @@
+// CheckoutScreen.tsx
 import React, { useState } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
 import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
@@ -20,6 +21,7 @@ const CheckoutScreen = () => {
   const [selectedPayment, setSelectedPayment] = useState<
     'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil' | null
   >(null);
+  const [selectedLocation, setSelectedLocation] = useState<string | null>(null);
   const [currentStep, setCurrentStep] = useState(1);
   const { cartItems } = useCart();
 
@@ -58,6 +60,20 @@ const CheckoutScreen = () => {
     }
   };
 
+  const isStep1Complete =
+    selectedOption !== null &&
+    selectedPayment !== null &&
+    selectedLocation !== null;
+
+  const isStep2Complete = isSimplifiedSteps || selectedPayment !== null;
+
+  const isButtonEnabled =
+    currentStep === 1
+      ? isStep1Complete
+      : currentStep === 2
+        ? isStep2Complete
+        : true;
+
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
@@ -80,7 +96,10 @@ const CheckoutScreen = () => {
                   label="Retiro en Sucursal"
                   icon={<ShoppingBagIcon color={Colors.textMain} />}
                   selected={selectedOption === 'pickup'}
-                  onPress={() => setSelectedOption('pickup')}
+                  onPress={() => {
+                    setSelectedOption('pickup');
+                    setSelectedLocation(null);
+                  }}
                 />
               </View>
               <View>
@@ -88,13 +107,16 @@ const CheckoutScreen = () => {
                   label="Delivery"
                   icon={<TruckIcon color={Colors.textMain} />}
                   selected={selectedOption === 'delivery'}
-                  onPress={() => setSelectedOption('delivery')}
+                  onPress={() => {
+                    setSelectedOption('delivery');
+                    setSelectedLocation(null);
+                  }}
                 />
               </View>
             </View>
             <LocationSelector
               selectedOption={selectedOption}
-              onSelect={(val) => console.log('Seleccionado:', val)}
+              onSelect={(val) => setSelectedLocation(val)}
             />
             <View style={styles.paymentMethods}>
               <PaymentMethods
@@ -145,7 +167,8 @@ const CheckoutScreen = () => {
             title={currentStep < stepsLabels.length ? 'Continuar' : 'Finalizar'}
             size="medium"
             style={styles.checkoutButton}
-            onPress={handleContinue}
+            variant={isButtonEnabled ? 'primary' : 'disabled'}
+            onPress={isButtonEnabled ? handleContinue : undefined}
           />
         </View>
       </View>

From 162fe556dc1af428c5edbc1f84ad94a6c06b3612 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 12 Apr 2025 11:03:08 -0400
Subject: [PATCH 090/291] Update Coupon component to disable button when coupon
 code is empty

---
 src/components/Coupon.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index 856ca4f..08a80e9 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -22,6 +22,8 @@ const Coupon: React.FC<CouponProps> = ({
     }
   };
 
+  const isButtonDisabled = couponCode.trim().length === 0;
+
   return (
     <View style={styles.container}>
       <PoppinsText style={styles.label}>Ingresa el Cupón</PoppinsText>
@@ -51,7 +53,7 @@ const Coupon: React.FC<CouponProps> = ({
         <Button
           title="Aplicar"
           onPress={handleApply}
-          variant="primary"
+          variant={isButtonDisabled ? 'disabled' : 'primary'}
           size="medium"
           loading={isLoading}
           style={styles.button}

From 9c73ac3cfa94275cb5482189a05e6bcf2a7fbe6c Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 12 Apr 2025 12:08:53 -0400
Subject: [PATCH 091/291] Add PurchaseStatusMessage component and enhance
 CheckoutScreen with order confirmation logic

---
 src/components/PurchaseStatusMessage.tsx |  73 +++++++++++
 src/screens/CheckoutScreen.tsx           | 153 +++++++++++++++++++++--
 2 files changed, 219 insertions(+), 7 deletions(-)
 create mode 100644 src/components/PurchaseStatusMessage.tsx

diff --git a/src/components/PurchaseStatusMessage.tsx b/src/components/PurchaseStatusMessage.tsx
new file mode 100644
index 0000000..c60143a
--- /dev/null
+++ b/src/components/PurchaseStatusMessage.tsx
@@ -0,0 +1,73 @@
+import React from 'react';
+import { CheckCircleIcon, XCircleIcon } from 'react-native-heroicons/outline';
+import theme from '../styles/theme';
+import { Text, View, StyleSheet } from 'react-native';
+
+interface PurchaseStatusMessageProps {
+  status: 'approved' | 'rejected';
+  orderNumber: string;
+  userName: string;
+}
+
+const PurchaseStatusMessage: React.FC<PurchaseStatusMessageProps> = ({
+  status,
+  orderNumber,
+  userName,
+}) => {
+  return (
+    <View style={styles.container}>
+      <View style={styles.iconContainer}>
+        {status === 'approved' ? (
+          <CheckCircleIcon
+            width={30}
+            height={30}
+            color={theme.Colors.semanticSuccess}
+          />
+        ) : (
+          <XCircleIcon
+            width={30}
+            height={30}
+            color={theme.Colors.semanticDanger}
+          />
+        )}
+      </View>
+      <View style={styles.textContainer}>
+        <Text style={[styles.title, { color: theme.Colors.textMain }]}>
+          Orden #{orderNumber}
+        </Text>
+        <Text style={[styles.message, { color: theme.Colors.textLowContrast }]}>
+          {status === 'approved'
+            ? `¡Gracias por tu compra, ${userName}!`
+            : 'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.'}
+        </Text>
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+    alignSelf: 'center',
+    width: '90%',
+    padding: 16,
+  },
+  iconContainer: {
+    marginRight: 10,
+  },
+  textContainer: {
+    flex: 1,
+  },
+  title: {
+    fontSize: 20,
+    fontFamily: theme.Fonts.poppinsSemibold,
+  },
+  message: {
+    fontSize: 14,
+    fontFamily: theme.Fonts.poppinsRegular,
+  },
+});
+
+export default PurchaseStatusMessage;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 4693d5f..37fb5a2 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,7 +1,11 @@
 // CheckoutScreen.tsx
 import React, { useState } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
-import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
+import {
+  ShoppingBagIcon,
+  TruckIcon,
+  MapPinIcon,
+} from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
@@ -10,11 +14,14 @@ import Button from '../components/Button';
 import Steps from '../components/Steps';
 import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
-import Coupon from '../components/Coupon';
 import LocationSelector from '../components/LocationSelector';
 import PaymentInfoForm from '../components/PaymentInfoForm';
+import Coupon from '../components/Coupon';
+import PurchaseStatusMessage from '../components/PurchaseStatusMessage';
+import { useRouter } from 'expo-router';
 
 const CheckoutScreen = () => {
+  const router = useRouter();
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
   >('pickup');
@@ -23,6 +30,7 @@ const CheckoutScreen = () => {
   >(null);
   const [selectedLocation, setSelectedLocation] = useState<string | null>(null);
   const [currentStep, setCurrentStep] = useState(1);
+  const [status] = useState<'approved' | 'rejected'>('approved'); // Remove setStatus
   const { cartItems } = useCart();
 
   const isSimplifiedSteps =
@@ -60,6 +68,12 @@ const CheckoutScreen = () => {
     }
   };
 
+  const handleGoToHome = () => {
+    router.replace({
+      pathname: '/(tabs)',
+    });
+  };
+
   const isStep1Complete =
     selectedOption !== null &&
     selectedPayment !== null &&
@@ -74,6 +88,71 @@ const CheckoutScreen = () => {
         ? isStep2Complete
         : true;
 
+  const renderConfirmationContent = (status: 'approved' | 'rejected') => {
+    if (selectedOption === 'pickup' && status === 'approved') {
+      return (
+        <>
+          <PoppinsText style={styles.confirmationMessage}>
+            Tu pedido ya está listo para que pases por él en la sucursal
+            indicada. En el mapa adjunto podrás ver la ubicación exacta para que
+            llegues sin problemas.
+          </PoppinsText>
+          <PoppinsText style={styles.sucursalText}>
+            Sucursal de retiro: [Nombre de la sucursal]
+          </PoppinsText>
+          <Button
+            title="Ver Ubicación en el Mapa"
+            size="small"
+            style={styles.secondaryButton}
+            variant="secondary"
+            icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
+            onPress={() => console.log('Ver ubicación en el mapa')}
+          />
+        </>
+      );
+    }
+
+    if (selectedOption === 'delivery' && status === 'approved') {
+      return (
+        <>
+          <PoppinsText style={styles.confirmationMessage}>
+            Estamos preparando tu pedido para enviarlo a la dirección indicada.
+          </PoppinsText>
+          <PoppinsText style={styles.confirmationMessage}>
+            Recibirás notificaciones cuando tu pedido esté en camino. En breve,
+            un motorizado tomará tu orden.
+          </PoppinsText>
+          <Button
+            title="Información del repartidor"
+            size="small"
+            style={styles.secondaryButton}
+            variant="secondary"
+            onPress={() => console.log('Información del repartidor')}
+          />
+        </>
+      );
+    }
+
+    if (status === 'rejected') {
+      return (
+        <>
+          <PoppinsText style={styles.confirmationMessage}>
+            Lamentamos informarte que hubo un problema al generar tu pedido.
+          </PoppinsText>
+          <Button
+            title="Volver a Intentar"
+            size="medium"
+            style={styles.primaryButton}
+            variant="primary"
+            onPress={() => console.log('Volver a Intentar')}
+          />
+        </>
+      );
+    }
+
+    return null;
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
@@ -149,10 +228,28 @@ const CheckoutScreen = () => {
           </>
         )}
 
+        {currentStep === stepsLabels.length && (
+          <>
+            <PoppinsText style={styles.purchaseOptionsTitle}>
+              Confirmación de Orden
+            </PoppinsText>
+            <PurchaseStatusMessage
+              status={status}
+              orderNumber="12345"
+              userName="Cliente1"
+            />
+            <View style={styles.confirmationContainer}>
+              {renderConfirmationContent(status)}
+            </View>
+          </>
+        )}
+
         <View style={styles.whiteBackgroundContainer}>
-          <Coupon
-            onApplyCoupon={(code) => console.log('Cupon aplicado:', code)}
-          />
+          {currentStep !== stepsLabels.length && currentStep !== 2 && (
+            <Coupon
+              onApplyCoupon={(code) => console.log('Cupon aplicado:', code)}
+            />
+          )}
           <View style={styles.spacer} />
           <OrderSummary />
           <View style={styles.totalContainer}>
@@ -164,11 +261,23 @@ const CheckoutScreen = () => {
             </View>
           </View>
           <Button
-            title={currentStep < stepsLabels.length ? 'Continuar' : 'Finalizar'}
+            title={
+              currentStep === 2 && !isSimplifiedSteps
+                ? 'Confirmar Pago'
+                : currentStep < stepsLabels.length
+                  ? 'Continuar'
+                  : 'Volver al Home'
+            }
             size="medium"
             style={styles.checkoutButton}
             variant={isButtonEnabled ? 'primary' : 'disabled'}
-            onPress={isButtonEnabled ? handleContinue : undefined}
+            onPress={
+              currentStep < stepsLabels.length
+                ? isButtonEnabled
+                  ? handleContinue
+                  : undefined
+                : handleGoToHome
+            }
           />
         </View>
       </View>
@@ -257,6 +366,36 @@ const styles = StyleSheet.create({
     padding: 20,
     paddingTop: 0,
   },
+  confirmationContainer: {
+    marginTop: 20,
+    alignItems: 'center',
+    paddingHorizontal: 20,
+  },
+  confirmationMessage: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+    textAlign: 'center',
+    marginBottom: 10,
+  },
+  sucursalText: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
+    color: Colors.textLowContrast,
+    textAlign: 'center',
+    marginBottom: 20,
+  },
+  secondaryButton: {
+    marginBottom: 10,
+    backgroundColor: Colors.secondaryLight,
+    borderRadius: 8,
+    paddingHorizontal: 16,
+    paddingVertical: 8,
+  },
+  primaryButton: {
+    marginTop: 10,
+    width: '100%',
+  },
 });
 
 export default CheckoutScreen;

From b16fa6b9b380099f61d683606a97815ac400625f Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 12 Apr 2025 14:04:39 -0400
Subject: [PATCH 092/291] Remove unused setStatus function from CheckoutScreen
 state management

---
 src/screens/CheckoutScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 37fb5a2..d2ef5c6 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -30,7 +30,7 @@ const CheckoutScreen = () => {
   >(null);
   const [selectedLocation, setSelectedLocation] = useState<string | null>(null);
   const [currentStep, setCurrentStep] = useState(1);
-  const [status] = useState<'approved' | 'rejected'>('approved'); // Remove setStatus
+  const [status] = useState<'approved' | 'rejected'>('approved');
   const { cartItems } = useCart();
 
   const isSimplifiedSteps =

From 90fdf136e424a8bc35964fd36153bcd4aca437b8 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 13 Apr 2025 19:33:08 -0400
Subject: [PATCH 093/291] Implement LocationSelector with dynamic branch
 fetching and improve type definitions for Branch API

---
 src/components/LocationSelector.tsx | 55 ++++++++++++++++++++++-------
 src/services/branches.ts            | 47 ++++++++++++++++++++++++
 src/types/api.d.ts                  | 16 +++++++++
 3 files changed, 105 insertions(+), 13 deletions(-)
 create mode 100644 src/services/branches.ts

diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index 5097b62..b2a83d1 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -1,26 +1,50 @@
+import { useEffect, useState } from 'react';
 import { View, StyleSheet } from 'react-native';
 import Dropdown from './Dropdown';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
+import { BranchService } from '../services/branches';
+import { extractErrorMessage } from '../utils/errorHandler';
 
 const LocationSelector = ({
   selectedOption,
   onSelect,
 }: {
   selectedOption: 'pickup' | 'delivery' | null;
-  onSelect: (value: string) => void;
+  onSelect: (value: string | null) => void;
 }) => {
-  const pickupData = [
-    { label: 'Sucursal 1', value: '1' },
-    { label: 'Sucursal 2', value: '2' },
-    { label: 'Sucursal 3', value: '3' },
-  ].map((item) => item.label);
-
-  const deliveryData = [
-    { label: 'Dirección 1', value: '1' },
-    { label: 'Dirección 2', value: '2' },
-    { label: 'Dirección 3', value: '3' },
-  ].map((item) => item.label);
+  const [pickupData, setPickupData] = useState<string[]>([]);
+  const [deliveryData] = useState([
+    'Dirección 1',
+    'Dirección 2',
+    'Dirección 3',
+  ]);
+  const [selectedValue, setSelectedValue] = useState<string | null>(null);
+  const [dropdownKey, setDropdownKey] = useState(0); // Forzar reinicio del Dropdown
+
+  useEffect(() => {
+    const resetState = async () => {
+      // Reset value y forzar reinicio visual
+      setSelectedValue(null);
+      setDropdownKey((prev) => prev + 1); // Cambiar key para forzar remount
+      onSelect(null); // Notificar al padre
+
+      if (selectedOption === 'pickup') {
+        try {
+          const response = await BranchService.findAll({});
+          if (response.success) {
+            setPickupData(response.data.results.map((branch) => branch.name));
+          } else {
+            console.error('Error fetching branches:', response.error);
+          }
+        } catch (error) {
+          console.error('Error fetching branches:', extractErrorMessage(error));
+        }
+      }
+    };
+
+    resetState();
+  }, [selectedOption]);
 
   const options = selectedOption === 'pickup' ? pickupData : deliveryData;
 
@@ -34,9 +58,14 @@ const LocationSelector = ({
           : 'Seleccione la dirección de entrega'}
       </PoppinsText>
       <Dropdown
+        key={dropdownKey} // Forzar remount del Dropdown cuando cambia pickup/delivery
         options={options}
         placeholder="Selecciona una opción"
-        onSelect={(val) => onSelect(val)}
+        onSelect={(val) => {
+          setSelectedValue(val);
+          onSelect(val);
+        }}
+        selectedValue={selectedValue}
         borderColor={Colors.gray_100}
       />
     </View>
diff --git a/src/services/branches.ts b/src/services/branches.ts
new file mode 100644
index 0000000..2bfdb3e
--- /dev/null
+++ b/src/services/branches.ts
@@ -0,0 +1,47 @@
+import * as SecureStore from 'expo-secure-store';
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse, Pagination, BranchResponse } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+type FindAllParams = {
+  page?: number;
+  limit?: number;
+  q?: string;
+  stateId?: string;
+};
+
+export const BranchService = {
+  findAll: async ({
+    page = 1,
+    limit = 100,
+    q,
+    stateId,
+  }: FindAllParams): Promise<ServiceResponse<Pagination<BranchResponse>>> => {
+    try {
+      // Obtener token JWT desde SecureStore
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        return {
+          success: false,
+          error: 'No se encontró el token de autenticación.',
+        };
+      }
+
+      // Llamar a la API usando los parámetros recibidos
+      const response = await api.branch.findAll(
+        { page, limit, q, stateId },
+        jwt,
+      );
+
+      return {
+        success: true,
+        data: response,
+      };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 2fb6cf6..e1d5c72 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -86,3 +86,19 @@ type Inventory = BaseModel & {
   branch: BranchResponse;
   productPresentation: ProductPresentation;
 };
+
+export type Branch = {
+  name: string;
+  address: string;
+  latitude: number;
+  longitude: number;
+};
+
+export type CreateBranchRequest = Branch & {
+  cityId: string;
+};
+
+export type BranchResponse = Branch &
+  BaseModel & {
+    city: CityResponse;
+  };

From 88e5de5fc990da1d7573b8302be9762326b6f416 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sun, 13 Apr 2025 19:45:43 -0400
Subject: [PATCH 094/291] Refactor LocationSelector to remove unused
 selectedValue

---
 src/components/LocationSelector.tsx | 13 ++++---------
 1 file changed, 4 insertions(+), 9 deletions(-)

diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index b2a83d1..d32613b 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -19,15 +19,12 @@ const LocationSelector = ({
     'Dirección 2',
     'Dirección 3',
   ]);
-  const [selectedValue, setSelectedValue] = useState<string | null>(null);
   const [dropdownKey, setDropdownKey] = useState(0); // Forzar reinicio del Dropdown
 
   useEffect(() => {
     const resetState = async () => {
-      // Reset value y forzar reinicio visual
-      setSelectedValue(null);
-      setDropdownKey((prev) => prev + 1); // Cambiar key para forzar remount
-      onSelect(null); // Notificar al padre
+      setDropdownKey((prev) => prev + 1);
+      onSelect(null); // Notificar al padre que se reinició
 
       if (selectedOption === 'pickup') {
         try {
@@ -58,14 +55,12 @@ const LocationSelector = ({
           : 'Seleccione la dirección de entrega'}
       </PoppinsText>
       <Dropdown
-        key={dropdownKey} // Forzar remount del Dropdown cuando cambia pickup/delivery
+        key={dropdownKey} // Forzar reinicio del Dropdown cuando cambia pickup/delivery
         options={options}
         placeholder="Selecciona una opción"
         onSelect={(val) => {
-          setSelectedValue(val);
-          onSelect(val);
+          onSelect(val); // Notificar al padre
         }}
-        selectedValue={selectedValue}
         borderColor={Colors.gray_100}
       />
     </View>

From db6f9a2b28a0d2b587d99c9af162e86df59918e8 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 13 Apr 2025 23:07:19 -0400
Subject: [PATCH 095/291] Starting delivery flow

---
 src/app/(delivery-tabs)/_layout.tsx           |  76 +++++++++
 src/app/(delivery-tabs)/deliveryHistory.tsx   |   6 +
 src/app/(delivery-tabs)/deliverySupport.tsx   |   6 +
 src/app/(delivery-tabs)/index.tsx             |   6 +
 src/app/_layout.tsx                           |   1 +
 src/components/Badge.tsx                      |  59 +++++--
 src/components/Button.tsx                     |  23 ++-
 src/components/OrderCard.tsx                  | 144 +++++++++++++++++
 src/components/TopBarDelivery.tsx             | 148 ++++++++++++++++++
 .../delivery/DeliveryHistoryScreen.tsx        |  27 ++++
 src/screens/delivery/DeliveryHomeScreen.tsx   |  79 ++++++++++
 .../delivery/DeliverySupportScreen.tsx        |  21 +++
 src/screens/tab/OffersScreen.tsx              |  47 +++++-
 src/styles/theme.ts                           |   2 +
 14 files changed, 620 insertions(+), 25 deletions(-)
 create mode 100644 src/app/(delivery-tabs)/_layout.tsx
 create mode 100644 src/app/(delivery-tabs)/deliveryHistory.tsx
 create mode 100644 src/app/(delivery-tabs)/deliverySupport.tsx
 create mode 100644 src/app/(delivery-tabs)/index.tsx
 create mode 100644 src/components/OrderCard.tsx
 create mode 100644 src/components/TopBarDelivery.tsx
 create mode 100644 src/screens/delivery/DeliveryHistoryScreen.tsx
 create mode 100644 src/screens/delivery/DeliveryHomeScreen.tsx
 create mode 100644 src/screens/delivery/DeliverySupportScreen.tsx

diff --git a/src/app/(delivery-tabs)/_layout.tsx b/src/app/(delivery-tabs)/_layout.tsx
new file mode 100644
index 0000000..62657e6
--- /dev/null
+++ b/src/app/(delivery-tabs)/_layout.tsx
@@ -0,0 +1,76 @@
+import { Tabs } from 'expo-router';
+import { View, StyleSheet } from 'react-native';
+import { Colors } from '../../styles/theme';
+import PoppinsText from '../../components/PoppinsText';
+import {
+  HomeIcon,
+  ClockIcon,
+  LifebuoyIcon,
+} from 'react-native-heroicons/outline';
+import TopBarDelivery from '../../components/TopBarDelivery';
+
+export default function DeliveryTabLayout() {
+  return (
+    <View style={styles.container}>
+      <TopBarDelivery />
+      <Tabs
+        screenOptions={{
+          tabBarActiveTintColor: Colors.primary,
+          tabBarStyle: { backgroundColor: Colors.secondaryWhite },
+        }}
+      >
+        <Tabs.Screen
+          name="index"
+          options={{
+            tabBarLabel: ({ color }) => (
+              <PoppinsText style={{ color: color, fontSize: 10 }}>
+                Home
+              </PoppinsText>
+            ),
+            headerShown: false,
+            title: 'Home',
+            tabBarIcon: () => (
+              <HomeIcon width={24} height={24} color={Colors.primary} />
+            ),
+          }}
+        />
+        <Tabs.Screen
+          name="deliveryHistory"
+          options={{
+            tabBarLabel: ({ color }) => (
+              <PoppinsText style={{ color: color, fontSize: 10 }}>
+                Historial
+              </PoppinsText>
+            ),
+            headerShown: false,
+            title: 'Historial',
+            tabBarIcon: () => (
+              <ClockIcon width={24} height={24} color={Colors.primary} />
+            ),
+          }}
+        />
+        <Tabs.Screen
+          name="deliverySupport"
+          options={{
+            tabBarLabel: ({ color }) => (
+              <PoppinsText style={{ color: color, fontSize: 10 }}>
+                Soporte
+              </PoppinsText>
+            ),
+            headerShown: false,
+            title: 'Soporte',
+            tabBarIcon: () => (
+              <LifebuoyIcon width={24} height={24} color={Colors.primary} />
+            ),
+          }}
+        />
+      </Tabs>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+});
diff --git a/src/app/(delivery-tabs)/deliveryHistory.tsx b/src/app/(delivery-tabs)/deliveryHistory.tsx
new file mode 100644
index 0000000..ff6b5b9
--- /dev/null
+++ b/src/app/(delivery-tabs)/deliveryHistory.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import DeliveryHistoryScreen from '../../screens/delivery/DeliveryHistoryScreen';
+
+export default function DeliveryHistory() {
+  return <DeliveryHistoryScreen />;
+}
diff --git a/src/app/(delivery-tabs)/deliverySupport.tsx b/src/app/(delivery-tabs)/deliverySupport.tsx
new file mode 100644
index 0000000..fae268e
--- /dev/null
+++ b/src/app/(delivery-tabs)/deliverySupport.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import DeliverySupportScreen from '../../screens/delivery/DeliverySupportScreen';
+
+export default function DeliverySupport() {
+  return <DeliverySupportScreen />;
+}
diff --git a/src/app/(delivery-tabs)/index.tsx b/src/app/(delivery-tabs)/index.tsx
new file mode 100644
index 0000000..8255937
--- /dev/null
+++ b/src/app/(delivery-tabs)/index.tsx
@@ -0,0 +1,6 @@
+import React from 'react';
+import DeliveryHomeScreen from '../../screens/delivery/DeliveryHomeScreen';
+
+export default function DeliveryHome() {
+  return <DeliveryHomeScreen />;
+}
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 1b030f1..185efae 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -101,6 +101,7 @@ export default function RootLayout() {
           name="change-password"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen name="(delivery-tabs)" options={{ headerShown: false }} />
       </Stack>
     </Provider>
   );
diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index 7089c1c..37f29f8 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -11,9 +11,16 @@ import PoppinsText from './PoppinsText';
 
 export interface BadgeProps {
   variant: 'filled' | 'outlined' | 'text';
-  color: 'primary' | 'warning' | 'danger' | 'success' | 'info';
+  color:
+    | 'primary'
+    | 'warning'
+    | 'danger'
+    | 'success'
+    | 'info'
+    | 'secondary_300';
   size: 'tiny' | 'small' | 'medium' | 'large';
   borderRadius?: 'rounded' | 'square';
+  textColor?: string;
   children: React.ReactNode;
 }
 
@@ -22,13 +29,14 @@ const Badge: React.FC<BadgeProps> = ({
   color,
   size,
   borderRadius = 'rounded',
+  textColor,
   children,
 }) => {
   const sizeStyles: Record<string, StyleProp<ViewStyle | TextStyle>> = {
-    tiny: { width: 17, height: 17, fontSize: 10 }, // Fixed width and height for a perfect circle
-    small: { width: 24, height: 24, fontSize: 12 },
-    medium: { width: 32, height: 32, fontSize: 14 },
-    large: { width: 40, height: 40, fontSize: 16 },
+    tiny: { height: 17, fontSize: 10, minWidth: 17 },
+    small: { height: 24, fontSize: 12, minWidth: 24 },
+    medium: { height: 32, fontSize: 14, minWidth: 32 },
+    large: { height: 40, fontSize: 16, minWidth: 40 },
   };
 
   const borderRadiusStyles: Record<string, StyleProp<ViewStyle>> = {
@@ -55,6 +63,10 @@ const Badge: React.FC<BadgeProps> = ({
         color: Colors.textWhite,
       },
       info: { backgroundColor: Colors.semanticInfo, color: Colors.textWhite },
+      secondary_300: {
+        backgroundColor: Colors.secondary_300,
+        color: Colors.textWhite,
+      },
     },
     outlined: {
       primary: {
@@ -82,6 +94,11 @@ const Badge: React.FC<BadgeProps> = ({
         borderWidth: 1,
         color: Colors.semanticInfo,
       },
+      secondary_300: {
+        borderColor: Colors.secondary_300,
+        borderWidth: 1,
+        color: Colors.secondary_300,
+      },
     },
     text: {
       primary: { color: Colors.primary },
@@ -89,6 +106,7 @@ const Badge: React.FC<BadgeProps> = ({
       danger: { color: Colors.semanticDanger },
       success: { color: Colors.semanticSuccess },
       info: { color: Colors.semanticInfo },
+      secondary_300: { color: Colors.secondary_300 },
     },
   };
 
@@ -97,19 +115,27 @@ const Badge: React.FC<BadgeProps> = ({
   const borderRadiusStyle = borderRadiusStyles[borderRadius];
 
   return (
-    <View style={[styles.base, sizeStyle, borderRadiusStyle, variantStyle]}>
+    <View
+      style={[
+        styles.base,
+        sizeStyle,
+        borderRadiusStyle,
+        variantStyle,
+        { paddingHorizontal: (children?.toString().length ?? 0) > 1 ? 6 : 4 },
+      ]}
+    >
       <PoppinsText
         style={[
           styles.text,
-          variant === 'outlined' || variant === 'text'
-            ? {
-                color:
-                  (variantStyle as TextStyle).borderColor || Colors.textWhite,
-              }
-            : { color: Colors.textWhite },
+          {
+            color:
+              textColor ||
+              (variantStyle as TextStyle).color ||
+              Colors.textWhite,
+          },
         ]}
-        numberOfLines={1} // Ensures the text does not wrap
-        ellipsizeMode="clip" // Prevents truncation
+        numberOfLines={1}
+        ellipsizeMode="clip"
       >
         {children}
       </PoppinsText>
@@ -121,12 +147,13 @@ const styles = StyleSheet.create({
   base: {
     justifyContent: 'center',
     alignItems: 'center',
+    paddingHorizontal: 4,
   },
   text: {
     textAlign: 'center',
     marginTop: 1.5,
-    lineHeight: 16, // Matches the height for vertical centering
-    fontSize: 10, // Matches the font size for the "tiny" size
+    lineHeight: 16,
+    fontSize: 10,
   },
 });
 
diff --git a/src/components/Button.tsx b/src/components/Button.tsx
index d123ef0..fac699e 100644
--- a/src/components/Button.tsx
+++ b/src/components/Button.tsx
@@ -17,7 +17,8 @@ export type ButtonVariant =
   | 'secondaryLight'
   | 'secondaryWhite'
   | 'secondaryGray'
-  | 'disabled';
+  | 'disabled'
+  | 'iconCancel';
 
 export type ButtonMode = 'filled' | 'outline';
 
@@ -67,6 +68,10 @@ const getButtonStyles = (
       backgroundColor = Colors.stroke;
       borderColor = Colors.stroke;
       break;
+    case 'iconCancel': // Nuevo color para el botón "Descartar"
+      backgroundColor = Colors.iconCancel;
+      borderColor = Colors.iconCancel;
+      break;
     default:
       backgroundColor = Colors.primary;
       borderColor = Colors.primary;
@@ -98,19 +103,23 @@ const getTextColor = (variant: ButtonVariant, mode: ButtonMode): string => {
         return Colors.secondaryGray;
       case 'disabled':
         return Colors.disableText;
+      case 'iconCancel': // Color para el texto del botón "Descartar"
+        return Colors.iconCancel;
       default:
         return Colors.primary;
     }
   }
   return variant === 'secondaryWhite'
     ? Colors.textHighContrast
-    : variant === 'secondary'
-      ? Colors.textHighContrast
-      : variant === 'secondaryLight'
+    : variant === 'iconCancel'
+      ? Colors.textWhite
+      : variant === 'disabled'
         ? Colors.textHighContrast
-        : variant === 'disabled'
-          ? Colors.disableText
-          : Colors.textWhite;
+        : variant === 'secondary'
+          ? Colors.textHighContrast
+          : variant === 'secondaryLight'
+            ? Colors.disableText
+            : Colors.textWhite;
 };
 
 const getFontSizeStyle = (size: ButtonSize): TextStyle => {
diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
new file mode 100644
index 0000000..0299b25
--- /dev/null
+++ b/src/components/OrderCard.tsx
@@ -0,0 +1,144 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import {
+  MapPinIcon,
+  BuildingOfficeIcon,
+  ClockIcon,
+} from 'react-native-heroicons/outline';
+import Badge from './Badge';
+import Button from './Button';
+import PoppinsText from './PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
+
+interface OrderCardProps {
+  orderCode: string;
+  orderType: 'pedido' | 'reubicación';
+  address: string;
+  branch: string;
+  estimatedTime: string;
+  elapsedTime: string;
+  onTakeOrder: () => void;
+  onDiscardOrder: () => void;
+}
+
+const OrderCard: React.FC<OrderCardProps> = ({
+  orderCode,
+  orderType,
+  address,
+  branch,
+  estimatedTime,
+  elapsedTime,
+  onTakeOrder,
+  onDiscardOrder,
+}) => {
+  return (
+    <View style={styles.card}>
+      {/* Header */}
+      <View style={styles.header}>
+        <Badge
+          variant="filled"
+          color={orderType === 'pedido' ? 'info' : 'secondary_300'}
+          size="small"
+          borderRadius="square"
+          textColor={Colors.primary}
+        >
+          {orderType === 'pedido' ? 'Pedido' : 'Reubicación de productos'}
+        </Badge>
+        <PoppinsText style={styles.elapsedTime}>{elapsedTime}</PoppinsText>
+      </View>
+
+      {/* Order Code */}
+      <PoppinsText style={styles.orderCode}>
+        {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
+      </PoppinsText>
+
+      {/* Details */}
+      <View style={styles.details}>
+        <View style={styles.detailRow}>
+          <MapPinIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>{address}</PoppinsText>
+        </View>
+        <View style={styles.detailRow}>
+          <BuildingOfficeIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>
+            Buscar en: {branch}
+          </PoppinsText>
+        </View>
+        <View style={styles.detailRow}>
+          <ClockIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>{estimatedTime}</PoppinsText>
+        </View>
+      </View>
+
+      {/* Buttons */}
+      <View>
+        <Button
+          title="Tomar pedido"
+          variant="primary"
+          size="medium"
+          onPress={onTakeOrder}
+          style={styles.button}
+        />
+        <Button
+          title="Descartar"
+          variant="iconCancel"
+          mode="outline"
+          size="medium"
+          onPress={onDiscardOrder}
+          style={styles.button}
+        />
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  card: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 16,
+    marginBottom: 16,
+    shadowColor: Colors.textLowContrast,
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+    width: '100%',
+    height: 300,
+  },
+  header: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  elapsedTime: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+  },
+  orderCode: {
+    fontSize: FontSizes.h5.size,
+    fontWeight: 'bold',
+    color: Colors.primary,
+    marginBottom: 8,
+  },
+  details: {
+    marginBottom: 4,
+  },
+  detailRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  detailText: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textMain,
+    marginLeft: 8,
+  },
+  button: {
+    marginBottom: 8,
+  },
+});
+
+export default OrderCard;
diff --git a/src/components/TopBarDelivery.tsx b/src/components/TopBarDelivery.tsx
new file mode 100644
index 0000000..0591771
--- /dev/null
+++ b/src/components/TopBarDelivery.tsx
@@ -0,0 +1,148 @@
+import React, { useState } from 'react';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
+import { BellIcon } from 'react-native-heroicons/outline';
+import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
+import SearchInput from './SearchInput';
+import { Colors } from '../styles/theme';
+import { useRouter } from 'expo-router';
+import Avatar from './Avatar';
+import Popup from './Popup';
+import { AuthService } from '../services/auth';
+
+const TopBarDelivery = () => {
+  const [searchText, setSearchText] = useState('');
+  const [isPopupVisible, setIsPopupVisible] = useState(false);
+  const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
+    useState(false);
+  const router = useRouter();
+
+  const handleSearch = () => {
+    console.log('Texto de búsqueda:', searchText);
+  };
+
+  const handleLogout = async () => {
+    try {
+      await AuthService.logout(); // Llama al método logout del servicio de autenticación
+      setIsLogoutConfirmationVisible(false); // Cierra el popup de confirmación
+
+      // Verificar si hay pantallas en la pila antes de llamar a dismissAll
+      if (router.canGoBack()) {
+        router.dismissAll();
+      }
+
+      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
+    } catch (error) {
+      console.error('Error al cerrar sesión:', error);
+    }
+  };
+
+  return (
+    <View style={styles.container}>
+      {/* Upper section */}
+      <View style={styles.topSection}>
+        {/* Left user icon */}
+        <View>
+          <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
+            <Avatar />
+          </TouchableOpacity>
+        </View>
+
+        {/* Logo */}
+        <View style={styles.logoContainer}>
+          <Logo width={118} height={48} />
+        </View>
+
+        {/* Right notification icon */}
+        <TouchableOpacity
+          style={styles.iconButton}
+          onPress={() => {
+            router.push('/notifications'); // Redirige a la pantalla de notificaciones
+          }}
+        >
+          <BellIcon size={26} color={Colors.textMain} />
+        </TouchableOpacity>
+      </View>
+
+      {/* Search Input */}
+      <SearchInput
+        value={searchText}
+        onChangeText={setSearchText}
+        onSearchPress={handleSearch}
+        style={styles.searchInput}
+      />
+
+      {/* Popup for Avatar Options */}
+      <Popup
+        visible={isPopupVisible}
+        type="center"
+        headerText="Opciones"
+        bodyText="Selecciona una acción:"
+        primaryButton={{
+          text: 'Cambiar contraseña',
+          onPress: () => {
+            setIsPopupVisible(false);
+            router.push('/change-password');
+          },
+        }}
+        secondaryButton={{
+          text: 'Cerrar sesión',
+          onPress: () => {
+            setIsPopupVisible(false);
+            setIsLogoutConfirmationVisible(true); // Muestra el popup de confirmación
+          },
+        }}
+        onClose={() => setIsPopupVisible(false)}
+      />
+
+      {/* Popup for Logout Confirmation */}
+      <Popup
+        visible={isLogoutConfirmationVisible}
+        type="center"
+        headerText="Cerrar sesión"
+        bodyText="¿Estás seguro de que deseas cerrar sesión?"
+        primaryButton={{
+          text: 'Sí',
+          onPress: handleLogout,
+        }}
+        secondaryButton={{
+          text: 'No',
+          onPress: () => setIsLogoutConfirmationVisible(false),
+        }}
+        onClose={() => setIsLogoutConfirmationVisible(false)}
+      />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    backgroundColor: Colors.bgColor,
+    paddingHorizontal: 16,
+    paddingTop: 12,
+    paddingBottom: 12,
+  },
+  topSection: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 12,
+  },
+  logoContainer: {
+    flex: 1,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  iconButton: {
+    paddingRight: 4,
+    position: 'relative',
+  },
+  searchInput: {
+    backgroundColor: Colors.menuWhite,
+    borderWidth: 1,
+    borderColor: Colors.stroke,
+    height: 32,
+    borderRadius: 50,
+  },
+});
+
+export default TopBarDelivery;
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
new file mode 100644
index 0000000..7b51a0c
--- /dev/null
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -0,0 +1,27 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import PoppinsText from '../../components/PoppinsText';
+import { Colors } from '../../styles/theme';
+
+export default function DeliveryHistoryScreen() {
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.title}>Historial de Pedidos</PoppinsText>
+      {/* Aquí se mostrará el historial de pedidos */}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 16,
+  },
+  title: {
+    fontSize: 20,
+    fontWeight: 'bold',
+    color: Colors.textMain,
+    marginBottom: 16,
+  },
+});
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
new file mode 100644
index 0000000..68242b2
--- /dev/null
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -0,0 +1,79 @@
+import React from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import PoppinsText from '../../components/PoppinsText';
+import OrderCard from '../../components/OrderCard';
+import { Colors, FontSizes } from '../../styles/theme';
+
+export default function DeliveryHomeScreen() {
+  const orders: Array<{
+    id: string;
+    type: 'pedido' | 'reubicación';
+    address: string;
+    branch: string;
+    estimatedTime: string;
+    elapsedTime: string;
+  }> = [
+    {
+      id: '12345',
+      type: 'pedido',
+      address: 'Av. Principal 123, Ciudad',
+      branch: 'Sucursal Central',
+      estimatedTime: '30 minutos',
+      elapsedTime: 'Hace 10 minutos',
+    },
+    {
+      id: '67890',
+      type: 'reubicación',
+      address: 'Calle Secundaria 456, Ciudad',
+      branch: 'Sucursal Norte',
+      estimatedTime: '45 minutos',
+      elapsedTime: 'Hace 5 minutos',
+    },
+  ];
+
+  const handleTakeOrder = (orderId: string) => {
+    console.log(`Tomar pedido: ${orderId}`);
+  };
+
+  const handleDiscardOrder = (orderId: string) => {
+    console.log(`Descartar pedido: ${orderId}`);
+  };
+
+  return (
+    <View style={styles.container}>
+      <PoppinsText style={styles.title} weight="regular">
+        Pedidos asignados
+      </PoppinsText>
+      <ScrollView showsVerticalScrollIndicator={false}>
+        {orders.map((order) => (
+          <OrderCard
+            key={order.id}
+            orderCode={order.id}
+            orderType={order.type}
+            address={order.address}
+            branch={order.branch}
+            estimatedTime={order.estimatedTime}
+            elapsedTime={order.elapsedTime}
+            onTakeOrder={() => handleTakeOrder(order.id)}
+            onDiscardOrder={() => handleDiscardOrder(order.id)}
+          />
+        ))}
+      </ScrollView>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 16,
+    marginHorizontal: 4,
+  },
+  title: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 16,
+  },
+});
diff --git a/src/screens/delivery/DeliverySupportScreen.tsx b/src/screens/delivery/DeliverySupportScreen.tsx
new file mode 100644
index 0000000..5b841c7
--- /dev/null
+++ b/src/screens/delivery/DeliverySupportScreen.tsx
@@ -0,0 +1,21 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import PoppinsText from '../../components/PoppinsText';
+import { Colors } from '../../styles/theme';
+
+export default function SupportScreen() {
+  return (
+    <View style={styles.container}>
+      <PoppinsText>Pantalla Soporte</PoppinsText>
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
+});
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 9ca0574..0d39d26 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -1,12 +1,43 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
+import { UserService } from '../../services/user'; // Servicio para obtener el perfil del usuario
+import { useRouter } from 'expo-router';
 
 export default function OffersScreen() {
+  const [userRole, setUserRole] = useState<string | null>(null);
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchUserRole = async () => {
+      const profile = await UserService.getProfile();
+      if (profile.success) {
+        setUserRole(profile.data.role); // Establece el rol del usuario
+      }
+    };
+    fetchUserRole();
+  }, []);
+
+  const handleNavigateToDeliveryFlow = () => {
+    router.push('/(delivery-tabs)'); // Redirige al flujo exclusivo para deliveries
+  };
+
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Ofertas</PoppinsText>
+
+      {/* Mostrar el botón solo si el rol es "delivery" */}
+      {userRole === 'delivery' && (
+        <TouchableOpacity
+          style={styles.deliveryButton}
+          onPress={handleNavigateToDeliveryFlow}
+        >
+          <PoppinsText style={styles.deliveryButtonText}>
+            Ir al flujo de Delivery
+          </PoppinsText>
+        </TouchableOpacity>
+      )}
     </View>
   );
 }
@@ -18,4 +49,16 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: Colors.bgColor,
   },
+  deliveryButton: {
+    marginTop: 20,
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    backgroundColor: Colors.primary,
+    borderRadius: 8,
+  },
+  deliveryButtonText: {
+    color: Colors.textWhite,
+    fontSize: 16,
+    fontWeight: 'bold',
+  },
 });
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 458e3ff..e704a4e 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -35,6 +35,8 @@ export const Colors = {
 
   gray_100: '#E7E7E6',
   gray_500: '#6E6D6C',
+
+  secondary_300: '#8BEAB3',
 };
 
 export const Fonts = {

From ca901e0dcd34740311a935a80968a668c40c6fc9 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 15 Apr 2025 14:44:08 -0400
Subject: [PATCH 096/291] Delivery history screen

---
 src/components/Avatar.tsx                     |  62 ++++++--
 src/components/Badge.tsx                      |  15 +-
 src/components/HistoryOrderCard.tsx           | 142 ++++++++++++++++++
 .../delivery/DeliveryHistoryScreen.tsx        |  67 ++++++++-
 src/styles/theme.ts                           |   2 +
 5 files changed, 266 insertions(+), 22 deletions(-)
 create mode 100644 src/components/HistoryOrderCard.tsx

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 1b906bd..66a8bb2 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,11 +1,16 @@
 import React, { useEffect, useState } from 'react';
 import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
-import { Colors, FontSizes } from '../styles/theme';
+import { Colors } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
 
-const Avatar: React.FC = () => {
+interface AvatarProps {
+  size?: number; // Propiedad para definir el tamaño del avatar
+  model?: 'default' | 'small'; // Propiedad para diferenciar entre modelos
+}
+
+const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
   const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
   const [loading, setLoading] = useState(true);
 
@@ -19,7 +24,6 @@ const Avatar: React.FC = () => {
           'No se encontró el token de autenticación. Usando datos locales.',
         );
 
-        // Data from secureStore
         const userData = await SecureStore.getItemAsync('user_data');
         if (userData) {
           const { firstName, lastName } = JSON.parse(userData);
@@ -51,26 +55,60 @@ const Avatar: React.FC = () => {
   }, []);
 
   const getInitials = (fullName: string): string => {
-    console.log('Full Name:', fullName);
     const words = fullName.trim().split(' ');
     if (words.length === 1) return words[0].charAt(0).toUpperCase();
     return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
   };
 
+  const avatarSize = model === 'small' ? 20 : size;
+  const fontSize = avatarSize / 2.5;
+  const lineHeight = fontSize + 1;
+  const marginTop = avatarSize / 10;
   if (loading) {
     return (
-      <View style={[styles.avatarContainer, styles.loadingContainer]}>
+      <View
+        style={[
+          styles.avatarContainer,
+          styles.loadingContainer,
+          {
+            width: avatarSize,
+            height: avatarSize,
+            borderRadius: avatarSize / 2,
+          },
+        ]}
+      >
         <ActivityIndicator color={Colors.textWhite} />
       </View>
     );
   }
 
   return (
-    <View style={styles.avatar}>
+    <View
+      style={[
+        styles.avatar,
+        { width: avatarSize, height: avatarSize, borderRadius: avatarSize / 2 },
+      ]}
+    >
       {profile.uri ? (
-        <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
+        <Image
+          source={{ uri: profile.uri }}
+          style={[
+            styles.avatarImage,
+            { width: avatarSize, height: avatarSize },
+          ]}
+        />
       ) : (
-        <PoppinsText style={styles.initials} weight="semibold">
+        <PoppinsText
+          style={[
+            styles.initials,
+            {
+              fontSize: fontSize,
+              lineHeight: lineHeight,
+              marginTop: marginTop,
+            },
+          ]}
+          weight="semibold"
+        >
           {profile.name ? getInitials(profile.name) : ''}
         </PoppinsText>
       )}
@@ -80,23 +118,17 @@ const Avatar: React.FC = () => {
 
 const styles = StyleSheet.create({
   avatar: {
-    width: 32,
-    height: 32,
-    borderRadius: 16,
     backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
     overflow: 'hidden',
   },
   avatarImage: {
-    width: 32,
-    height: 32,
     resizeMode: 'cover',
   },
   initials: {
-    fontSize: FontSizes.label.size,
-    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textWhite,
+    textAlign: 'center',
   },
   avatarContainer: {
     backgroundColor: Colors.primary,
diff --git a/src/components/Badge.tsx b/src/components/Badge.tsx
index 37f29f8..e308669 100644
--- a/src/components/Badge.tsx
+++ b/src/components/Badge.tsx
@@ -17,7 +17,8 @@ export interface BadgeProps {
     | 'danger'
     | 'success'
     | 'info'
-    | 'secondary_300';
+    | 'secondary_300'
+    | 'primary_300';
   size: 'tiny' | 'small' | 'medium' | 'large';
   borderRadius?: 'rounded' | 'square';
   textColor?: string;
@@ -63,10 +64,16 @@ const Badge: React.FC<BadgeProps> = ({
         color: Colors.textWhite,
       },
       info: { backgroundColor: Colors.semanticInfo, color: Colors.textWhite },
+
       secondary_300: {
         backgroundColor: Colors.secondary_300,
         color: Colors.textWhite,
       },
+
+      primary_300: {
+        backgroundColor: Colors.primary_300,
+        color: Colors.textWhite,
+      },
     },
     outlined: {
       primary: {
@@ -99,6 +106,11 @@ const Badge: React.FC<BadgeProps> = ({
         borderWidth: 1,
         color: Colors.secondary_300,
       },
+      primary_300: {
+        borderColor: Colors.primary_300,
+        borderWidth: 1,
+        color: Colors.primary_300,
+      },
     },
     text: {
       primary: { color: Colors.primary },
@@ -107,6 +119,7 @@ const Badge: React.FC<BadgeProps> = ({
       success: { color: Colors.semanticSuccess },
       info: { color: Colors.semanticInfo },
       secondary_300: { color: Colors.secondary_300 },
+      primary_300: { color: Colors.primary_300 },
     },
   };
 
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
new file mode 100644
index 0000000..f813c16
--- /dev/null
+++ b/src/components/HistoryOrderCard.tsx
@@ -0,0 +1,142 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import {
+  MapPinIcon,
+  BuildingOfficeIcon,
+  ClockIcon,
+} from 'react-native-heroicons/outline';
+import { CheckCircleIcon } from 'react-native-heroicons/solid';
+import Badge from './Badge';
+import Avatar from './Avatar';
+import Button from './Button';
+import PoppinsText from './PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
+
+interface HistoryOrderCardProps {
+  orderCode: string;
+  orderType: 'pedido' | 'reubicación';
+  address: string;
+  branch: string;
+  estimatedTime: string;
+  elapsedTime: string;
+  completionTime: string;
+  userName: string;
+  onViewDetails: () => void;
+}
+
+const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
+  orderCode,
+  orderType,
+  address,
+  branch,
+  estimatedTime,
+  elapsedTime,
+  completionTime,
+  userName,
+  onViewDetails,
+}) => {
+  return (
+    <View style={styles.card}>
+      {/* Header */}
+      <View style={styles.header}>
+        <Badge
+          variant="filled"
+          color="primary_300"
+          size="small"
+          borderRadius="square"
+        >
+          {`${elapsedTime}, ${completionTime}`}
+        </Badge>
+        <PoppinsText style={styles.elapsedTime}>{elapsedTime}</PoppinsText>
+      </View>
+
+      {/* Order Code */}
+      <PoppinsText style={styles.orderCode}>
+        <CheckCircleIcon size={20} color={Colors.semanticSuccess} />{' '}
+        {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
+      </PoppinsText>
+
+      {/* Details */}
+      <View style={styles.details}>
+        <View style={styles.detailRow}>
+          <MapPinIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>{address}</PoppinsText>
+        </View>
+        <View style={styles.detailRow}>
+          <Avatar model="small" />
+          <PoppinsText style={styles.detailText}>{userName}</PoppinsText>
+        </View>
+        <View style={styles.detailRow}>
+          <BuildingOfficeIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>
+            Buscar en: {branch}
+          </PoppinsText>
+        </View>
+        <View style={styles.detailRow}>
+          <ClockIcon size={20} color={Colors.primary} />
+          <PoppinsText style={styles.detailText}>{estimatedTime}</PoppinsText>
+        </View>
+      </View>
+
+      {/* Button */}
+      <Button
+        title="Ver detalles"
+        variant="primary"
+        size="medium"
+        onPress={onViewDetails}
+        style={styles.button}
+      />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  card: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 16,
+    marginBottom: 16,
+    shadowColor: Colors.textLowContrast,
+    shadowOffset: { width: 0, height: 2 },
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+    width: '100%',
+    height: 280,
+  },
+  header: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  orderCode: {
+    fontSize: FontSizes.h5.size,
+    fontWeight: 'bold',
+    color: Colors.primary,
+    marginBottom: 8,
+  },
+  elapsedTime: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.gray_500,
+  },
+  details: {
+    marginBottom: 4,
+  },
+  detailRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  detailText: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textMain,
+    marginLeft: 8,
+  },
+  button: {
+    marginBottom: 8,
+  },
+});
+
+export default HistoryOrderCard;
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 7b51a0c..b7f7e3a 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -1,13 +1,67 @@
 import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, ScrollView } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
+import HistoryOrderCard from '../../components/HistoryOrderCard';
+import { Colors, FontSizes } from '../../styles/theme';
 
 export default function DeliveryHistoryScreen() {
+  const completedOrders: Array<{
+    id: string;
+    type: 'pedido' | 'reubicación';
+    address: string;
+    branch: string;
+    estimatedTime: string;
+    elapsedTime: string;
+    completionTime: string; // Hora de finalización
+    userName: string; // Nombre del usuario
+  }> = [
+    {
+      id: '12345',
+      type: 'pedido',
+      address: 'Av. Principal 123, Ciudad',
+      branch: 'Sucursal Central',
+      estimatedTime: '30 minutos',
+      elapsedTime: 'Hace 2 días',
+      completionTime: '14:30',
+      userName: 'Nombre Usuario',
+    },
+    {
+      id: '67890',
+      type: 'reubicación',
+      address: 'Calle Secundaria 456, Ciudad',
+      branch: 'Sucursal Norte',
+      estimatedTime: '45 minutos',
+      elapsedTime: 'Hace 1 semana',
+      completionTime: '16:45',
+      userName: 'Nombre Usuario',
+    },
+  ];
+
+  const handleViewDetails = (orderId: string) => {
+    console.log(`Ver detalles del pedido: ${orderId}`);
+  };
+
   return (
     <View style={styles.container}>
-      <PoppinsText style={styles.title}>Historial de Pedidos</PoppinsText>
-      {/* Aquí se mostrará el historial de pedidos */}
+      <PoppinsText style={styles.title} weight="regular">
+        Historial de Pedidos
+      </PoppinsText>
+      <ScrollView showsVerticalScrollIndicator={false}>
+        {completedOrders.map((order) => (
+          <HistoryOrderCard
+            key={order.id}
+            orderCode={order.id}
+            orderType={order.type}
+            address={order.address}
+            branch={order.branch}
+            estimatedTime={order.estimatedTime}
+            elapsedTime={order.elapsedTime}
+            completionTime={order.completionTime}
+            userName={order.userName}
+            onViewDetails={() => handleViewDetails(order.id)}
+          />
+        ))}
+      </ScrollView>
     </View>
   );
 }
@@ -17,10 +71,11 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
     padding: 16,
+    marginHorizontal: 4,
   },
   title: {
-    fontSize: 20,
-    fontWeight: 'bold',
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
     marginBottom: 16,
   },
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index e704a4e..66b4919 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -37,6 +37,8 @@ export const Colors = {
   gray_500: '#6E6D6C',
 
   secondary_300: '#8BEAB3',
+
+  primary_300: '#A2BEEE',
 };
 
 export const Fonts = {

From 10ca2d2f7d6b61403fe8ba29c43a9646532a4e8c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 15 Apr 2025 18:49:02 -0400
Subject: [PATCH 097/291] Updating SDK

---
 package-lock.json | 8 ++++----
 package.json      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8110c6b..73d30a1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.1",
+        "@pharmatech/sdk": "^0.4.2",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
-      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
+      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index d8b20f6..fb7e659 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.1",
+    "@pharmatech/sdk": "^0.4.2",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
@@ -39,14 +39,14 @@
     "react-native": "0.76.7",
     "react-native-calendars": "^1.1310.0",
     "react-native-heroicons": "^4.0.0",
+    "react-native-maps": "1.18.0",
     "react-native-pager-view": "^6.7.0",
     "react-native-reanimated": "^3.16.2",
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17",
-    "react-native-maps": "1.18.0"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

From 765ca5e91f466b47fee147b8eecc8acb2ba8740e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 16 Apr 2025 19:14:48 -0400
Subject: [PATCH 098/291] Refactor PaymentInfoForm to unify input properties
 and enhance payment method handling

---
 src/components/PaymentInfoForm.tsx | 99 +++++++++++++-----------------
 1 file changed, 43 insertions(+), 56 deletions(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 1a08be8..a0b81b0 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -1,4 +1,3 @@
-// components/PaymentInfoForm.tsx
 import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from './PoppinsText';
@@ -20,9 +19,21 @@ const PaymentInfoForm = ({
   if (!paymentMethod) {
     return null;
   }
+
+  const staticInputProps = {
+    isEditable: false,
+    backgroundColor: Colors.gray_100,
+    border: 'default' as const,
+  };
+
+  const editableInputProps = {
+    backgroundColor: Colors.iconWhite,
+  };
+
   return (
     <View style={styles.container}>
-      {paymentMethod === 'pago_movil' && (
+      {(paymentMethod === 'pago_movil' ||
+        paymentMethod === 'transferencia') && (
         <>
           <PoppinsText style={styles.label}>
             Realiza el pago en la siguiente cuenta de Pharmatech
@@ -37,82 +48,58 @@ const PaymentInfoForm = ({
               <Input
                 label="Banco Asociado"
                 value="Banco Venezuela"
-                isEditable={false}
+                {...staticInputProps}
               />
             </View>
             <View style={styles.inputWrapper}>
-              <Input label="Teléfono" value="0414-1234567" isEditable={false} />
+              {paymentMethod === 'pago_movil' ? (
+                <Input
+                  label="Teléfono"
+                  value="0414-1234567"
+                  {...staticInputProps}
+                />
+              ) : (
+                <Input
+                  label="Cuenta"
+                  value="0134-2452-30-2536432346"
+                  {...staticInputProps}
+                />
+              )}
             </View>
           </View>
 
           <View style={styles.row}>
             <View style={styles.inputWrapper}>
-              <Input label="RIF" value="J-008720001" isEditable={false} />
+              <Input label="RIF" value="J-008720001" {...staticInputProps} />
             </View>
             <View style={styles.inputWrapper}>
-              <Input label="Monto" value={total} isEditable={false} />
+              <Input label="Monto" value={total} {...staticInputProps} />
             </View>
           </View>
 
           <PoppinsText style={styles.label}>
             Ingrese los datos para validar el pago
           </PoppinsText>
-          <Input label="Banco" placeholder="Ingrese el banco" />
-          <Input label="Referencia" placeholder="Ingrese la referencia" />
           <Input
-            label="Número de documento"
-            placeholder="Ingrese su número de documento"
+            label="Banco"
+            placeholder="Ingrese el banco"
+            {...editableInputProps}
+          />
+          <Input
+            label="Referencia"
+            placeholder="Ingrese la referencia"
+            {...editableInputProps}
           />
-          <Input label="Teléfono" placeholder="Ingrese su número de teléfono" />
-        </>
-      )}
-
-      {paymentMethod === 'transferencia' && (
-        <>
-          <PoppinsText style={styles.label}>
-            Realiza el pago en la siguiente cuenta de Pharmatech
-          </PoppinsText>
-          <PoppinsText style={styles.label1}>
-            Debes hacer el pago del monto exacto, de lo contrario no se creará
-            la orden
-          </PoppinsText>
-
-          <View style={styles.row}>
-            <View style={styles.inputWrapper}>
-              <Input
-                label="Banco Asociado"
-                value="Banco Venezuela"
-                isEditable={false}
-              />
-            </View>
-            <View style={styles.inputWrapper}>
-              <Input
-                label="Cuenta"
-                value="0134-2452-30-2536432346"
-                isEditable={false}
-              />
-            </View>
-          </View>
-
-          <View style={styles.row}>
-            <View style={styles.inputWrapper}>
-              <Input label="RIF" value="J-008720001" isEditable={false} />
-            </View>
-            <View style={styles.inputWrapper}>
-              <Input label="Monto" value={total} isEditable={false} />
-            </View>
-          </View>
-
-          <PoppinsText style={styles.label}>
-            Ingrese los datos para validar el pago
-          </PoppinsText>
-          <Input label="Banco" placeholder="Ingrese el banco" />
-          <Input label="Referencia" placeholder="Ingrese la referencia" />
           <Input
             label="Número de documento"
             placeholder="Ingrese su número de documento"
+            {...editableInputProps}
+          />
+          <Input
+            label="Teléfono"
+            placeholder="Ingrese su número de teléfono"
+            {...editableInputProps}
           />
-          <Input label="Teléfono" placeholder="Ingrese su número de teléfono" />
         </>
       )}
     </View>

From 7d8a4017881e8a120d2cf6cf87092a48b883ad2c Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 16 Apr 2025 19:47:53 -0400
Subject: [PATCH 099/291] Fixing the flow of step 2 for payment validation and
 changing the colors to the correct ones

---
 src/components/PaymentInfoForm.tsx | 47 ++++++++++++++++++++++++++----
 src/screens/CheckoutScreen.tsx     |  5 +++-
 2 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index a0b81b0..317ef49 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -1,4 +1,4 @@
-import React from 'react';
+import React, { useState, useEffect } from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from './PoppinsText';
 import Input from './Input';
@@ -7,6 +7,7 @@ import { FontSizes, Colors } from '../styles/theme';
 const PaymentInfoForm = ({
   paymentMethod,
   total,
+  onValidationChange,
 }: {
   paymentMethod:
     | 'punto_de_venta'
@@ -15,7 +16,27 @@ const PaymentInfoForm = ({
     | 'pago_movil'
     | null;
   total: string;
+  onValidationChange: (isValid: boolean) => void;
 }) => {
+  const [bank, setBank] = useState('');
+  const [reference, setReference] = useState('');
+  const [documentNumber, setDocumentNumber] = useState('');
+  const [phone, setPhone] = useState('');
+
+  useEffect(() => {
+    const isValid =
+      paymentMethod !== null &&
+      (paymentMethod === 'pago_movil' || paymentMethod === 'transferencia')
+        ? bank.trim() !== '' &&
+          /^\d+$/.test(reference) &&
+          reference.trim() !== '' &&
+          /^\d{1,8}$/.test(documentNumber) &&
+          /^\d{11}$/.test(phone)
+        : true;
+
+    onValidationChange(isValid);
+  }, [bank, reference, documentNumber, phone, paymentMethod]);
+
   if (!paymentMethod) {
     return null;
   }
@@ -30,6 +51,17 @@ const PaymentInfoForm = ({
     backgroundColor: Colors.iconWhite,
   };
 
+  const handleNumericChange = (
+    setter: (val: string) => void,
+    limit?: number,
+  ) => {
+    return (val: string) => {
+      let filtered = val.replace(/\D/g, '');
+      if (limit) filtered = filtered.slice(0, limit);
+      setter(filtered);
+    };
+  };
+
   return (
     <View style={styles.container}>
       {(paymentMethod === 'pago_movil' ||
@@ -80,24 +112,29 @@ const PaymentInfoForm = ({
           <PoppinsText style={styles.label}>
             Ingrese los datos para validar el pago
           </PoppinsText>
+
           <Input
             label="Banco"
-            placeholder="Ingrese el banco"
+            value={bank}
+            getValue={setBank}
             {...editableInputProps}
           />
           <Input
             label="Referencia"
-            placeholder="Ingrese la referencia"
+            value={reference}
+            getValue={handleNumericChange(setReference)}
             {...editableInputProps}
           />
           <Input
             label="Número de documento"
-            placeholder="Ingrese su número de documento"
+            value={documentNumber}
+            getValue={handleNumericChange(setDocumentNumber, 8)}
             {...editableInputProps}
           />
           <Input
             label="Teléfono"
-            placeholder="Ingrese su número de teléfono"
+            value={phone}
+            getValue={handleNumericChange(setPhone, 11)}
             {...editableInputProps}
           />
         </>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index d2ef5c6..48234b7 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -32,6 +32,7 @@ const CheckoutScreen = () => {
   const [currentStep, setCurrentStep] = useState(1);
   const [status] = useState<'approved' | 'rejected'>('approved');
   const { cartItems } = useCart();
+  const [isPaymentInfoValid, setIsPaymentInfoValid] = useState(false); // Default to false
 
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
@@ -79,7 +80,8 @@ const CheckoutScreen = () => {
     selectedPayment !== null &&
     selectedLocation !== null;
 
-  const isStep2Complete = isSimplifiedSteps || selectedPayment !== null;
+  const isStep2Complete =
+    isSimplifiedSteps || (selectedPayment !== null && isPaymentInfoValid); // Include payment info validation
 
   const isButtonEnabled =
     currentStep === 1
@@ -223,6 +225,7 @@ const CheckoutScreen = () => {
               <PaymentInfoForm
                 paymentMethod={selectedPayment}
                 total={total.toFixed(2)}
+                onValidationChange={setIsPaymentInfoValid} // Pass validation callback
               />
             </View>
           </>

From 3570c1da2657d04c32363a7fa1e58a451baad858 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 16 Apr 2025 21:29:39 -0400
Subject: [PATCH 100/291] Coupon integration, functional, makes the discount
 (from the coupon) before calculating the IVA

---
 src/components/Coupon.tsx       | 50 ++++++++++++++++++++---
 src/components/OrderSummary.tsx |  7 ----
 src/screens/CheckoutScreen.tsx  | 71 ++++++++++++++++++++++++++-------
 src/services/coupon.ts          | 27 +++++++++++++
 src/types/api.d.ts              | 10 +++++
 5 files changed, 139 insertions(+), 26 deletions(-)
 create mode 100644 src/services/coupon.ts

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index 08a80e9..cb64cfd 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -4,25 +4,47 @@ import Input from './Input';
 import Button from './Button';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
+import { CouponService } from '../services/coupon';
 
 interface CouponProps {
-  onApplyCoupon: (code: string) => void;
+  onApplyCoupon: (discount: number) => void;
+  onCouponApplied: () => void;
   isLoading?: boolean;
 }
 
 const Coupon: React.FC<CouponProps> = ({
   onApplyCoupon,
+  onCouponApplied,
   isLoading = false,
 }) => {
   const [couponCode, setCouponCode] = useState('');
+  const [validationMessage, setValidationMessage] = useState<string | null>(
+    null,
+  );
+  const [loading, setLoading] = useState(false);
 
-  const handleApply = () => {
+  const handleApply = async () => {
     if (couponCode.trim().length > 0) {
-      onApplyCoupon(couponCode.trim());
+      setLoading(true);
+      setValidationMessage(null);
+
+      const response = await CouponService.validateCoupon(couponCode.trim());
+      setLoading(false);
+
+      if (response.success) {
+        const discount = response.data.discount;
+        setValidationMessage(
+          `Cupón válido. Se aplicó un descuento de ${discount}$ .`,
+        );
+        onApplyCoupon(discount);
+        onCouponApplied();
+      } else {
+        setValidationMessage(response.error || 'Error al validar el cupón.');
+      }
     }
   };
 
-  const isButtonDisabled = couponCode.trim().length === 0;
+  const isButtonDisabled = couponCode.trim().length === 0 || loading;
 
   return (
     <View style={styles.container}>
@@ -55,10 +77,24 @@ const Coupon: React.FC<CouponProps> = ({
           onPress={handleApply}
           variant={isButtonDisabled ? 'disabled' : 'primary'}
           size="medium"
-          loading={isLoading}
+          loading={loading || isLoading}
           style={styles.button}
         />
       </View>
+      {validationMessage && (
+        <PoppinsText
+          style={[
+            styles.validationMessage,
+            {
+              color: validationMessage.includes('Cupón válido')
+                ? Colors.semanticSuccess
+                : Colors.semanticDanger,
+            },
+          ]}
+        >
+          {validationMessage}
+        </PoppinsText>
+      )}
     </View>
   );
 };
@@ -86,6 +122,10 @@ const styles = StyleSheet.create({
     height: 44,
     paddingHorizontal: 16,
   },
+  validationMessage: {
+    marginTop: 8,
+    fontSize: FontSizes.b4.size,
+  },
 });
 
 export default Coupon;
diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 2eee540..791b4b5 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -18,7 +18,6 @@ const OrderSummary = () => {
     (sum, item) => sum + item.price * (item.quantity * 0.1),
     0,
   );
-  const iva = (subtotal - totalDiscount) * 0.12;
 
   const renderItem = ({ item }: { item: CartItem }) => {
     const discount = 10;
@@ -110,12 +109,6 @@ const OrderSummary = () => {
                 -${totalDiscount.toFixed(2)}
               </PoppinsText>
             </View>
-            <View style={styles.row}>
-              <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
-              <PoppinsText style={styles.ivaText}>
-                ${iva.toFixed(2)}
-              </PoppinsText>
-            </View>
           </View>
         </>
       )}
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 48234b7..d463fc4 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -32,7 +32,9 @@ const CheckoutScreen = () => {
   const [currentStep, setCurrentStep] = useState(1);
   const [status] = useState<'approved' | 'rejected'>('approved');
   const { cartItems } = useCart();
-  const [isPaymentInfoValid, setIsPaymentInfoValid] = useState(false); // Default to false
+  const [isPaymentInfoValid, setIsPaymentInfoValid] = useState(false);
+  const [couponDiscount, setCouponDiscount] = useState(0);
+  const [isCouponApplied, setIsCouponApplied] = useState(false);
 
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
@@ -45,13 +47,19 @@ const CheckoutScreen = () => {
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
-  );
+  ); // Total price sum
+
   const totalDiscount = cartItems.reduce(
     (sum, item) => sum + item.price * (item.quantity * 0.1),
     0,
-  );
-  const iva = (subtotal - totalDiscount) * 0.12;
-  const total = subtotal - totalDiscount + iva;
+  ); // Discount sum
+
+  const subtotalAfterDiscount = subtotal - totalDiscount;
+  const subtotalAfterCoupon = isCouponApplied
+    ? subtotalAfterDiscount - couponDiscount
+    : subtotalAfterDiscount;
+  const iva = subtotalAfterCoupon * 0.12;
+  const total = subtotalAfterCoupon + iva;
 
   const renderFooterMessage = () => {
     if (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') {
@@ -81,7 +89,7 @@ const CheckoutScreen = () => {
     selectedLocation !== null;
 
   const isStep2Complete =
-    isSimplifiedSteps || (selectedPayment !== null && isPaymentInfoValid); // Include payment info validation
+    isSimplifiedSteps || (selectedPayment !== null && isPaymentInfoValid);
 
   const isButtonEnabled =
     currentStep === 1
@@ -225,7 +233,7 @@ const CheckoutScreen = () => {
               <PaymentInfoForm
                 paymentMethod={selectedPayment}
                 total={total.toFixed(2)}
-                onValidationChange={setIsPaymentInfoValid} // Pass validation callback
+                onValidationChange={setIsPaymentInfoValid}
               />
             </View>
           </>
@@ -248,14 +256,33 @@ const CheckoutScreen = () => {
         )}
 
         <View style={styles.whiteBackgroundContainer}>
-          {currentStep !== stepsLabels.length && currentStep !== 2 && (
-            <Coupon
-              onApplyCoupon={(code) => console.log('Cupon aplicado:', code)}
-            />
-          )}
-          <View style={styles.spacer} />
+          <Coupon
+            onApplyCoupon={(discountAmount) => {
+              setCouponDiscount(discountAmount);
+              setIsCouponApplied(true);
+            }}
+            onCouponApplied={() => setIsCouponApplied(true)}
+          />
           <OrderSummary />
           <View style={styles.totalContainer}>
+            {isCouponApplied && (
+              <>
+                <View style={styles.totalRow}>
+                  <PoppinsText style={styles.descuentoLabel}>
+                    Subtotal después del Cupón:
+                  </PoppinsText>
+                  <PoppinsText style={styles.descuentoAmount}>
+                    ${subtotalAfterCoupon.toFixed(2)}
+                  </PoppinsText>
+                </View>
+              </>
+            )}
+            <View style={styles.totalRow}>
+              <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
+              <PoppinsText style={styles.descuentoAmount}>
+                +${iva.toFixed(2)}
+              </PoppinsText>
+            </View>
             <View style={styles.totalRow}>
               <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
               <PoppinsText style={styles.totalAmount}>
@@ -337,7 +364,7 @@ const styles = StyleSheet.create({
   },
   totalContainer: {
     width: '100%',
-    marginTop: 20,
+
     marginBottom: 10,
   },
   totalRow: {
@@ -351,11 +378,27 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
   },
+  descuentoLabel: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
+  descuentoAmount: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
   totalAmount: {
     fontSize: FontSizes.h5.size,
     lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
   },
+  strikethroughAmount: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textLowContrast,
+    textDecorationLine: 'line-through',
+  },
   checkoutButton: {
     marginBottom: 16,
     width: '100%',
diff --git a/src/services/coupon.ts b/src/services/coupon.ts
new file mode 100644
index 0000000..c4f3bc3
--- /dev/null
+++ b/src/services/coupon.ts
@@ -0,0 +1,27 @@
+import * as SecureStore from 'expo-secure-store';
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse, CouponResponse } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const CouponService = {
+  validateCoupon: async (
+    code: string,
+  ): Promise<ServiceResponse<CouponResponse>> => {
+    try {
+      // Retrieve the JWT token from SecureStore
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        return {
+          success: false,
+          error: 'No se encontró el token de autenticación.',
+        };
+      }
+
+      // Call the SDK's getByCode method
+      const response = await api.coupon.getByCode(code, jwt);
+      return { success: true, data: response };
+    } catch (error) {
+      return { success: false, error: extractErrorMessage(error) };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index e1d5c72..b0ee344 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -102,3 +102,13 @@ export type BranchResponse = Branch &
   BaseModel & {
     city: CityResponse;
   };
+
+export type Coupon = {
+  code: string;
+  discount: number;
+  minPurchase: number;
+  maxUses: number;
+  expirationDate: Date;
+};
+
+export type CouponResponse = Coupon & BaseModel;

From 3a4d5220412f6de5e3969f74d675dd5fec66a1e3 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 16 Apr 2025 22:28:04 -0400
Subject: [PATCH 101/291] Modal to view the location of the selected branch on
 the map

---
 src/components/BranchMapModal.tsx   | 120 ++++++++++++++++++++++++++++
 src/components/LocationSelector.tsx |  88 ++++++++++++++++++--
 2 files changed, 200 insertions(+), 8 deletions(-)
 create mode 100644 src/components/BranchMapModal.tsx

diff --git a/src/components/BranchMapModal.tsx b/src/components/BranchMapModal.tsx
new file mode 100644
index 0000000..5d8966c
--- /dev/null
+++ b/src/components/BranchMapModal.tsx
@@ -0,0 +1,120 @@
+import React from 'react';
+import { Modal, View, StyleSheet, TouchableOpacity } from 'react-native';
+import { XMarkIcon, MapPinIcon } from 'react-native-heroicons/solid';
+import PoppinsText from './PoppinsText';
+import BranchMap from './BranchMap'; // Import BranchMap
+import { Colors } from '../styles/theme';
+
+const BranchMapModal = ({
+  visible,
+  onClose,
+  branchName,
+  branchCoordinates,
+}: {
+  visible: boolean;
+  onClose: () => void;
+  branchName: string | null;
+  branchCoordinates: { latitude: number; longitude: number } | null; // Add branchCoordinates prop
+}) => {
+  return (
+    <Modal transparent visible={visible} animationType="fade">
+      <View style={styles.overlay}>
+        <View style={styles.modal}>
+          <TouchableOpacity onPress={onClose} style={styles.closeButton}>
+            <XMarkIcon size={24} color={Colors.textMain} />
+          </TouchableOpacity>
+
+          <PoppinsText style={styles.title}>Dirección de Sucursal</PoppinsText>
+
+          <View style={styles.mapContainer}>
+            {branchCoordinates ? (
+              <BranchMap
+                branches={[
+                  {
+                    id: '1',
+                    name: branchName || 'Sucursal',
+                    address: '',
+                    latitude: branchCoordinates.latitude,
+                    longitude: branchCoordinates.longitude,
+                    stockQuantity: 0,
+                  },
+                ]}
+              />
+            ) : (
+              <View style={styles.fakeMap} />
+            )}
+          </View>
+
+          {branchName ? (
+            <View style={styles.branchInfo}>
+              <MapPinIcon size={18} color={Colors.textMain} />
+              <PoppinsText style={styles.branchName}>{branchName}</PoppinsText>
+            </View>
+          ) : (
+            <PoppinsText style={styles.branchName}>
+              Seleccione una sucursal para ver su ubicación.
+            </PoppinsText>
+          )}
+        </View>
+      </View>
+    </Modal>
+  );
+};
+
+const styles = StyleSheet.create({
+  overlay: {
+    flex: 1,
+    backgroundColor: 'rgba(0,0,0,0.4)',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  modal: {
+    width: 352,
+    height: 448,
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 20,
+    alignItems: 'center',
+    position: 'relative',
+  },
+  closeButton: {
+    position: 'absolute',
+    top: 20,
+    right: 20,
+    zIndex: 10,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: '600',
+    color: Colors.textMain,
+    textAlign: 'center',
+    marginTop: 20,
+    marginBottom: 16,
+  },
+  mapContainer: {
+    width: 285,
+    height: 285,
+    borderRadius: 12,
+    overflow: 'hidden',
+    backgroundColor: Colors.gray_100,
+    marginBottom: 20,
+  },
+  fakeMap: {
+    flex: 1,
+    backgroundColor: '#ccc',
+  },
+  branchInfo: {
+    flexDirection: 'row',
+    alignSelf: 'flex-start',
+    alignItems: 'center',
+    marginLeft: 5,
+  },
+  branchName: {
+    fontSize: 14,
+    color: Colors.textMain,
+    marginLeft: 6,
+    textAlign: 'left',
+  },
+});
+
+export default BranchMapModal;
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index d32613b..2f1b619 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -1,10 +1,19 @@
 import { useEffect, useState } from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, TouchableOpacity } from 'react-native';
 import Dropdown from './Dropdown';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
 import { BranchService } from '../services/branches';
 import { extractErrorMessage } from '../utils/errorHandler';
+import { MapPinIcon } from 'react-native-heroicons/solid';
+import BranchMapModal from './BranchMapModal';
+
+type Branch = {
+  id: string;
+  name: string;
+  latitude: number;
+  longitude: number;
+};
 
 const LocationSelector = ({
   selectedOption,
@@ -13,24 +22,27 @@ const LocationSelector = ({
   selectedOption: 'pickup' | 'delivery' | null;
   onSelect: (value: string | null) => void;
 }) => {
-  const [pickupData, setPickupData] = useState<string[]>([]);
+  const [pickupBranches, setPickupBranches] = useState<Branch[]>([]);
   const [deliveryData] = useState([
     'Dirección 1',
     'Dirección 2',
     'Dirección 3',
   ]);
-  const [dropdownKey, setDropdownKey] = useState(0); // Forzar reinicio del Dropdown
+  const [dropdownKey, setDropdownKey] = useState(0);
+  const [modalVisible, setModalVisible] = useState(false);
+  const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
 
   useEffect(() => {
     const resetState = async () => {
       setDropdownKey((prev) => prev + 1);
-      onSelect(null); // Notificar al padre que se reinició
+      onSelect(null);
+      setSelectedBranch(null);
 
       if (selectedOption === 'pickup') {
         try {
           const response = await BranchService.findAll({});
           if (response.success) {
-            setPickupData(response.data.results.map((branch) => branch.name));
+            setPickupBranches(response.data.results);
           } else {
             console.error('Error fetching branches:', response.error);
           }
@@ -43,7 +55,10 @@ const LocationSelector = ({
     resetState();
   }, [selectedOption]);
 
-  const options = selectedOption === 'pickup' ? pickupData : deliveryData;
+  const options =
+    selectedOption === 'pickup'
+      ? pickupBranches.map((branch) => branch.name)
+      : deliveryData;
 
   if (!selectedOption) return null;
 
@@ -54,15 +69,58 @@ const LocationSelector = ({
           ? 'Seleccione la sucursal'
           : 'Seleccione la dirección de entrega'}
       </PoppinsText>
+
       <Dropdown
-        key={dropdownKey} // Forzar reinicio del Dropdown cuando cambia pickup/delivery
+        key={dropdownKey}
         options={options}
         placeholder="Selecciona una opción"
         onSelect={(val) => {
-          onSelect(val); // Notificar al padre
+          onSelect(val);
+          if (selectedOption === 'pickup') {
+            const branch = pickupBranches.find((b) => b.name === val);
+            setSelectedBranch(branch || null);
+          }
         }}
         borderColor={Colors.gray_100}
       />
+
+      <TouchableOpacity
+        style={styles.button}
+        onPress={() => setModalVisible(true)}
+        disabled={!selectedBranch}
+      >
+        {selectedOption === 'pickup' && (
+          <MapPinIcon
+            size={20}
+            color={selectedBranch ? Colors.primary : Colors.gray_500}
+          />
+        )}
+        <PoppinsText
+          style={[
+            styles.buttonText,
+            selectedOption === 'pickup' && styles.textWithIcon,
+            !selectedBranch && styles.disabledText,
+          ]}
+        >
+          {selectedOption === 'pickup'
+            ? 'Ver Ubicación en el Mapa'
+            : 'Agregar nueva dirección'}
+        </PoppinsText>
+      </TouchableOpacity>
+
+      <BranchMapModal
+        visible={modalVisible}
+        onClose={() => setModalVisible(false)}
+        branchName={selectedBranch?.name || null}
+        branchCoordinates={
+          selectedBranch
+            ? {
+                latitude: selectedBranch.latitude,
+                longitude: selectedBranch.longitude,
+              }
+            : null
+        }
+      />
     </View>
   );
 };
@@ -76,6 +134,20 @@ const styles = StyleSheet.create({
     marginBottom: 8,
     color: Colors.textMain,
   },
+  button: {
+    marginTop: 12,
+    flexDirection: 'row',
+    alignItems: 'center',
+  },
+  buttonText: {
+    color: Colors.primary,
+  },
+  textWithIcon: {
+    marginLeft: 6,
+  },
+  disabledText: {
+    color: Colors.gray_500,
+  },
 });
 
 export default LocationSelector;

From 3df81c57d9bd383de048bc10670b8ee5d6835aa6 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 16 Apr 2025 23:46:30 -0400
Subject: [PATCH 102/291] Modals to view branch map and address, not yet
 integrated with address

---
 src/components/AddAddressModal.tsx  | 110 ++++++++++++++++++++++++++++
 src/components/BranchMapModal.tsx   |   1 +
 src/components/LocationSelector.tsx |  19 ++++-
 3 files changed, 127 insertions(+), 3 deletions(-)
 create mode 100644 src/components/AddAddressModal.tsx

diff --git a/src/components/AddAddressModal.tsx b/src/components/AddAddressModal.tsx
new file mode 100644
index 0000000..8d4d15c
--- /dev/null
+++ b/src/components/AddAddressModal.tsx
@@ -0,0 +1,110 @@
+import React, { useState } from 'react';
+import { Modal, View, StyleSheet, TouchableOpacity } from 'react-native';
+import { XMarkIcon } from 'react-native-heroicons/solid';
+import PoppinsText from './PoppinsText';
+import { Colors } from '../styles/theme';
+import Input from './Input';
+import Button from './Button';
+
+const AddAddressModal = ({
+  visible,
+  onClose,
+}: {
+  visible: boolean;
+  onClose: () => void;
+}) => {
+  const [address, setAddress] = useState('');
+  const [postalCode, setPostalCode] = useState('');
+  const [additionalInfo, setAdditionalInfo] = useState('');
+  const [referencePoint, setReferencePoint] = useState('');
+
+  return (
+    <Modal transparent visible={visible} animationType="fade">
+      <View style={styles.overlay}>
+        <View style={styles.modal}>
+          <TouchableOpacity onPress={onClose} style={styles.closeButton}>
+            <XMarkIcon size={24} color={Colors.textMain} />
+          </TouchableOpacity>
+
+          <PoppinsText style={styles.title}>Nueva Dirección</PoppinsText>
+          <Input
+            placeholder="Dirección"
+            value={address}
+            getValue={setAddress}
+            backgroundColor="none"
+          />
+          <Input
+            placeholder="Código Postal"
+            value={postalCode}
+            getValue={setPostalCode}
+            fieldType="number"
+            backgroundColor="none"
+          />
+          <Input
+            placeholder="Información Adicional"
+            value={additionalInfo}
+            getValue={setAdditionalInfo}
+            backgroundColor="none"
+          />
+          <Input
+            placeholder="Punto de Referencia"
+            value={referencePoint}
+            getValue={setReferencePoint}
+            backgroundColor="none"
+          />
+          <View style={styles.buttonContainer}>
+            <Button title="Guardar" onPress={() => {}} variant="primary" />
+          </View>
+        </View>
+      </View>
+    </Modal>
+  );
+};
+
+const styles = StyleSheet.create({
+  overlay: {
+    flex: 1,
+    backgroundColor: 'rgba(0,0,0,0.4)',
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  modal: {
+    width: 352,
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 20,
+    alignItems: 'center',
+    position: 'relative',
+  },
+  closeButton: {
+    position: 'absolute',
+    top: 20,
+    right: 20,
+    zIndex: 10,
+  },
+  title: {
+    fontSize: 16,
+    fontWeight: '600',
+    color: Colors.textMain,
+    textAlign: 'center',
+    marginTop: 20,
+    marginBottom: 16,
+  },
+  input: {
+    width: '100%',
+    height: 48,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+    borderRadius: 8,
+    paddingHorizontal: 12,
+    color: Colors.textMain,
+    fontSize: 14,
+    marginBottom: 20,
+  },
+  buttonContainer: {
+    width: '100%',
+    marginTop: 20,
+  },
+});
+
+export default AddAddressModal;
diff --git a/src/components/BranchMapModal.tsx b/src/components/BranchMapModal.tsx
index 5d8966c..f60c712 100644
--- a/src/components/BranchMapModal.tsx
+++ b/src/components/BranchMapModal.tsx
@@ -76,6 +76,7 @@ const styles = StyleSheet.create({
     padding: 20,
     alignItems: 'center',
     position: 'relative',
+    elevation: 8,
   },
   closeButton: {
     position: 'absolute',
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index 2f1b619..ee0f736 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -7,6 +7,7 @@ import { BranchService } from '../services/branches';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { MapPinIcon } from 'react-native-heroicons/solid';
 import BranchMapModal from './BranchMapModal';
+import AddAddressModal from './AddAddressModal';
 
 type Branch = {
   id: string;
@@ -30,6 +31,7 @@ const LocationSelector = ({
   ]);
   const [dropdownKey, setDropdownKey] = useState(0);
   const [modalVisible, setModalVisible] = useState(false);
+  const [addAddressModalVisible, setAddAddressModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
 
   useEffect(() => {
@@ -86,8 +88,12 @@ const LocationSelector = ({
 
       <TouchableOpacity
         style={styles.button}
-        onPress={() => setModalVisible(true)}
-        disabled={!selectedBranch}
+        onPress={() =>
+          selectedOption === 'pickup'
+            ? setModalVisible(true)
+            : setAddAddressModalVisible(true)
+        }
+        disabled={selectedOption === 'pickup' && !selectedBranch}
       >
         {selectedOption === 'pickup' && (
           <MapPinIcon
@@ -99,7 +105,9 @@ const LocationSelector = ({
           style={[
             styles.buttonText,
             selectedOption === 'pickup' && styles.textWithIcon,
-            !selectedBranch && styles.disabledText,
+            selectedOption === 'pickup' &&
+              !selectedBranch &&
+              styles.disabledText,
           ]}
         >
           {selectedOption === 'pickup'
@@ -121,6 +129,11 @@ const LocationSelector = ({
             : null
         }
       />
+
+      <AddAddressModal
+        visible={addAddressModalVisible}
+        onClose={() => setAddAddressModalVisible(false)}
+      />
     </View>
   );
 };

From 645bba1b21e5925476a75c304f72e34a8be029e8 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 17 Apr 2025 11:11:01 -0400
Subject: [PATCH 103/291] Added edit direction screen

---
 package-lock.json                     |   7 +-
 src/app/_layout.tsx                   |   4 +
 src/app/change-direction/[id].tsx     |   2 +
 src/app/change-direction/_layout.tsx  |  12 +
 src/screens/DirectionChangeScreen.tsx | 317 ++++++++++++++++++++++++++
 src/screens/DirectionScreen.tsx       |   6 +-
 src/services/state.ts                 |  52 ++++-
 src/services/user.ts                  |  92 ++++++++
 src/types/api.d.ts                    |  17 ++
 9 files changed, 502 insertions(+), 7 deletions(-)
 create mode 100644 src/app/change-direction/[id].tsx
 create mode 100644 src/app/change-direction/_layout.tsx
 create mode 100644 src/screens/DirectionChangeScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index 8110c6b..81fb32c 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -3585,10 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
-      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
-      "license": "MIT",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
+      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 08df05e..9e3d65b 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -70,6 +70,10 @@ export default function RootLayout() {
         <Stack.Screen name="products" options={{ headerShown: false }} />
         <Stack.Screen name="profile" options={{ headerShown: false }} />
         <Stack.Screen name="direction" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="change-direction"
+          options={{ headerShown: false }}
+        />
         <Stack.Screen
           name="register"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/change-direction/[id].tsx b/src/app/change-direction/[id].tsx
new file mode 100644
index 0000000..c098574
--- /dev/null
+++ b/src/app/change-direction/[id].tsx
@@ -0,0 +1,2 @@
+import ChangeDirectionScreen from '../../screens/DirectionChangeScreen';
+export default ChangeDirectionScreen;
diff --git a/src/app/change-direction/_layout.tsx b/src/app/change-direction/_layout.tsx
new file mode 100644
index 0000000..12e0b44
--- /dev/null
+++ b/src/app/change-direction/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function DirectionLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
new file mode 100644
index 0000000..081c8b6
--- /dev/null
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -0,0 +1,317 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Input from '../components/Input';
+import Button from '../components/Button';
+import { UserService } from '../services/user';
+import { UserAddressResponse } from '../types/api';
+import Return from '../components/Return';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { validateRequiredFields } from '../utils/validators';
+import Alert from '../components/Alerts';
+
+import { StateService } from '../services/state';
+import { State, City } from '../types/api';
+import Dropdown from '../components/Dropdown';
+
+const ChangeDirectionScreen = () => {
+  const { id } = useLocalSearchParams<{ id: string }>();
+
+  const [address, setAddress] = useState<UserAddressResponse>({});
+  const [states, setStates] = useState<State[]>([]);
+  const [cities, setCities] = useState<City[]>([]);
+  const [selectedState, setSelectedState] = useState('');
+  const [selectedCity, setSelectedCity] = useState('');
+  const [isEditable, setIsEditable] = useState(false);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
+
+  useEffect(() => {
+    if (!id) setIsEditable(true);
+    const fetchStates = async () => {
+      const states = await StateService.getStates(1, 40);
+      if (states.success) {
+        setStates(states.data.results);
+      }
+    };
+    fetchStates();
+  }, []);
+
+  useEffect(() => {
+    const fetchCities = async () => {
+      const cities = await StateService.getCities(1, 40, selectedState);
+      if (cities.success) {
+        setCities(cities.data.results);
+      }
+    };
+    fetchCities();
+  }, [selectedState]);
+
+  useEffect(() => {
+    const fetchAddress = async (id: string) => {
+      try {
+        const address = await UserService.getDirection(id);
+
+        if (address.success) {
+          setAddress(address.data);
+
+          const city = await StateService.getCity(address.data.cityId);
+          if (city.success) {
+            setSelectedCity(city.data.name);
+            const state = await StateService.getState(city.data.state.id);
+            if (state.success) setSelectedState(state.data.name);
+          }
+        }
+      } catch (error) {
+        console.log(error);
+      }
+    };
+
+    if (id) fetchAddress(id);
+  }, []);
+
+  const submitAddress = async () => {
+    if (!validateRequiredFields([address.adress])) {
+      setShowErrorAlert(true);
+      setErrorMessage('Por favor completa todos los campos');
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const updatedAddress = {
+        adress: address.adress,
+        zipCode: address.zipCode,
+        cityId: selectedCity,
+        additionalInformation: address.additionalInformation,
+        referencePoint: address.referencePoint,
+      };
+
+      const response = id
+        ? await UserService.updateDirection(updatedAddress, id)
+        : await UserService.saveDirection(updatedAddress);
+
+      if (response.success) {
+        setIsEditable(false);
+        alert('Dirección actualizada exitosamente');
+      } else {
+        alert('Error al actualizar la dirección');
+      }
+      setLoading(false);
+    } catch (error) {
+      console.error('Error al actualizar la dirección:', error);
+      alert('Ocurrió un error al intentar actualizar la dirección');
+    }
+  };
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Dirección creada correctamente"
+            onClose={() => {
+              setShowSuccessAlert(false);
+              router.replace('/success');
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      {/* Header */}
+      <Return onClose={() => router.push('/')} />
+      <View style={styles.profileHeader}>
+        {isEditable ? (
+          <PoppinsText
+            style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}
+          >
+            {!id ? 'Agregar' : 'Editar'} Dirección
+          </PoppinsText>
+        ) : (
+          <PoppinsText
+            style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}
+          >
+            Ver Dirección
+          </PoppinsText>
+        )}
+      </View>
+
+      {/* Información de direccion */}
+      <View style={styles.profileInfo}>
+        {isEditable ? (
+          <Dropdown
+            label="Estado"
+            placeholder="Seleccione Estado"
+            options={states.map((state) => state.name)}
+            borderColor={Colors.gray_100}
+            onSelect={(option) => {
+              const sState = states.find((state) => state.name === option);
+              if (sState) setSelectedState(sState.id);
+            }}
+          />
+        ) : (
+          <Input
+            label="Estado"
+            value={selectedState}
+            isEditable={isEditable}
+            border={isEditable ? 'default' : 'none'}
+          />
+        )}
+        {isEditable ? (
+          <Dropdown
+            label="Ciudad"
+            placeholder="Seleccione Ciudad"
+            options={cities.map((city) => city.name)}
+            borderColor={Colors.gray_100}
+            onSelect={(option) => {
+              const sCity = cities.find((city) => city.name === option);
+              if (sCity) setSelectedCity(sCity.id);
+            }}
+          />
+        ) : (
+          <Input
+            label="Ciudad"
+            value={selectedCity}
+            isEditable={isEditable}
+            border={isEditable ? 'default' : 'none'}
+          />
+        )}
+
+        <Input
+          label="Dirección:* (Ubicación actual)"
+          value={address?.adress}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) => setAddress({ ...address, adress: value })}
+          errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
+        />
+        <Input
+          label="Código Postal:"
+          value={address?.zipCode}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) => setAddress({ ...address, zipCode: value })}
+          fieldType="number"
+          errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
+        />
+        <Input
+          label="Información adicional:"
+          value={address?.additionalInformation}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) =>
+            setAddress({ ...address, additionalInformation: value })
+          }
+          errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
+        />
+        <Input
+          label="Punto de referencia:"
+          value={address?.referencePoint}
+          isEditable={isEditable}
+          border={isEditable ? 'default' : 'none'}
+          getValue={(value) =>
+            setAddress({ ...address, referencePoint: value })
+          }
+          errorText="El campo no puede estar vacío"
+          backgroundColor={isEditable ? Colors.textWhite : undefined}
+        />
+      </View>
+
+      {/* Botón de editar al final */}
+      {!isEditable ? (
+        <Button title="Editar" onPress={() => setIsEditable(true)} />
+      ) : (
+        <Button
+          title="Guardar Cambios"
+          onPress={() => submitAddress()}
+          loading={loading}
+        />
+      )}
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  profileHeader: {
+    alignItems: 'center',
+    marginVertical: 15,
+  },
+  profileImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  profileInfo: {
+    marginBottom: 20,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
+
+export default ChangeDirectionScreen;
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index c0db8a4..b33eb39 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -120,7 +120,9 @@ const DirectionScreen = () => {
                 }}
               >
                 <TouchableOpacity
-                  onPress={() => router.push(`/editDirection/${direction.id}`)}
+                  onPress={() =>
+                    router.push(`change-direction/${direction.id}`)
+                  }
                 >
                   <PencilIcon color={Colors.iconMainPrimary} size={20} />
                 </TouchableOpacity>
@@ -138,7 +140,7 @@ const DirectionScreen = () => {
 
       <Button
         title="Agregar nueva dirección"
-        onPress={() => router.push('/editDirection')}
+        onPress={() => router.push('/change-direction')}
       />
     </ScrollView>
   );
diff --git a/src/services/state.ts b/src/services/state.ts
index 1291b6d..9f1d7c7 100644
--- a/src/services/state.ts
+++ b/src/services/state.ts
@@ -1,5 +1,10 @@
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, Pagination, State } from '../types/api.d';
+import {
+  ServiceResponse,
+  Pagination,
+  State,
+  CityResponse,
+} from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const StateService = {
@@ -21,4 +26,49 @@ export const StateService = {
       };
     }
   },
+
+  getState: async (id: string): Promise<ServiceResponse<State>> => {
+    try {
+      const state = await api.state.getById(id);
+      return { success: true, data: state };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  getCities: async (
+    page: number,
+    limit: number,
+    stateId: string,
+  ): Promise<ServiceResponse<Pagination<CityResponse>>> => {
+    try {
+      const cities = await api.city.findAll({
+        page: page,
+        limit: limit,
+        stateId: stateId,
+      });
+
+      return { success: true, data: cities };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  getCity: async (id: string): Promise<ServiceResponse<CityResponse>> => {
+    try {
+      const city = await api.city.getById(id);
+      return { success: true, data: city };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };
diff --git a/src/services/user.ts b/src/services/user.ts
index e604662..88b93cb 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -5,6 +5,7 @@ import {
   UpdateUser,
   UserList,
   UserAddressResponse,
+  CreateUserAddressRequest,
 } from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
@@ -95,4 +96,95 @@ export const UserService = {
       };
     }
   },
+
+  getDirection: async (
+    id: string,
+  ): Promise<ServiceResponse<UserAddressResponse>> => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      const response = await api.userAdress.getAddress(userId, id, token);
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  saveDirection: async (
+    userAddress: CreateUserAddressRequest,
+  ): Promise<ServiceResponse<CreateUserAddressRequest>> => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      const response = await api.userAdress.createAddress(
+        userId,
+        userAddress,
+        token,
+      );
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  updateDirection: async (
+    userAddress: CreateUserAddressRequest,
+    id: string,
+  ): Promise<ServiceResponse<CreateUserAddressRequest>> => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      const response = await api.userAdress.update(
+        userId,
+        userAddress,
+        id,
+        token,
+      );
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 02f76db..4d1ca87 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -102,8 +102,25 @@ type UserAddressResponse = {
   nameCountry: string;
 };
 
+type CreateUserAddressRequest = BaseModel & {
+  adress: string;
+  zipCode?: string;
+  latitude?: number | null;
+  longitude?: number | null;
+  cityId?: string;
+  additionalInformation?: string | null;
+  referencePoint?: string | null;
+};
+
 type State = {
+  id: string;
+  name: string;
+};
+
+type CityResponse = {
+  id: string;
   name: string;
+  state: StateResponse;
 };
 
 type Inventory = BaseModel & {

From bc8123638da972bfdad9799b10728af5b6f75cf9 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 17 Apr 2025 11:12:09 -0400
Subject: [PATCH 104/291] Updated sdk to 0.4.1

---
 package-lock.json | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 81fb32c..edaebc8 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.1",
+        "@pharmatech/sdk": "0.4.1",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
-      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
+      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
       "dependencies": {
         "axios": "^1.8.1"
       }

From 8278071e0d2e4e28f1deb4495d027bebb9879533 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 17 Apr 2025 11:28:10 -0400
Subject: [PATCH 105/291] -Adjusting the coupon error message -Adjusting the
 IVA rate from 12% to 16% -Adjusting the checkout navigation so you can now go
 back through the steps -Adjusting the payment form so the data is displayed
 correctly

---
 src/app/_layout.tsx                |  7 +++-
 src/components/Coupon.tsx          |  2 +-
 src/components/PaymentInfoForm.tsx | 20 +++++----
 src/screens/CartListScreen.tsx     |  2 +-
 src/screens/CheckoutScreen.tsx     | 66 +++++++++++++++++++-----------
 5 files changed, 63 insertions(+), 34 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index eb71f08..639fb4a 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -103,7 +103,12 @@ export default function RootLayout() {
         />
         <Stack.Screen
           name="checkout"
-          options={{ headerTitle: '', headerTransparent: true }}
+          options={{
+            headerTitle: '',
+            headerTransparent: true,
+            headerLeft: undefined,
+            headerShown: false,
+          }}
         />
       </Stack>
     </Provider>
diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index cb64cfd..480dad1 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -39,7 +39,7 @@ const Coupon: React.FC<CouponProps> = ({
         onApplyCoupon(discount);
         onCouponApplied();
       } else {
-        setValidationMessage(response.error || 'Error al validar el cupón.');
+        setValidationMessage('Cupón inválido'); // Mensaje personalizado de error
       }
     }
   };
diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 317ef49..c331dc6 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -84,6 +84,12 @@ const PaymentInfoForm = ({
               />
             </View>
             <View style={styles.inputWrapper}>
+              <Input label="RIF" value="J-008720001" {...staticInputProps} />
+            </View>
+          </View>
+
+          <View style={styles.row}>
+            <View style={[styles.inputWrapper, styles.largeInput]}>
               {paymentMethod === 'pago_movil' ? (
                 <Input
                   label="Teléfono"
@@ -98,13 +104,7 @@ const PaymentInfoForm = ({
                 />
               )}
             </View>
-          </View>
-
-          <View style={styles.row}>
-            <View style={styles.inputWrapper}>
-              <Input label="RIF" value="J-008720001" {...staticInputProps} />
-            </View>
-            <View style={styles.inputWrapper}>
+            <View style={[styles.inputWrapper, styles.smallInput]}>
               <Input label="Monto" value={total} {...staticInputProps} />
             </View>
           </View>
@@ -166,6 +166,12 @@ const styles = StyleSheet.create({
   inputWrapper: {
     flex: 1,
   },
+  largeInput: {
+    flex: 1.5,
+  },
+  smallInput: {
+    flex: 1,
+  },
 });
 
 export default PaymentInfoForm;
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index c84ae1a..a8cf88e 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -27,7 +27,7 @@ const CartListScreen = () => {
     (sum, item) => sum + item.price * (item.quantity * 0.1), // 12% discount
     0,
   ); // Discount sum
-  const iva = (subtotal - totalDiscount) * 0.12; // 10% subtotal minus discount
+  const iva = (subtotal - totalDiscount) * 0.16; // 10% subtotal minus discount
   const total = subtotal - totalDiscount + iva; // Subtotal, discount and IVA sum
 
   const renderItem = ({ item }: { item: CartItem }) => {
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index d463fc4..9b74abd 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,10 +1,10 @@
-// CheckoutScreen.tsx
 import React, { useState } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import {
   ShoppingBagIcon,
   TruckIcon,
   MapPinIcon,
+  ChevronLeftIcon,
 } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
@@ -47,18 +47,16 @@ const CheckoutScreen = () => {
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
-  ); // Total price sum
-
+  );
   const totalDiscount = cartItems.reduce(
     (sum, item) => sum + item.price * (item.quantity * 0.1),
     0,
-  ); // Discount sum
-
+  );
   const subtotalAfterDiscount = subtotal - totalDiscount;
   const subtotalAfterCoupon = isCouponApplied
     ? subtotalAfterDiscount - couponDiscount
     : subtotalAfterDiscount;
-  const iva = subtotalAfterCoupon * 0.12;
+  const iva = subtotalAfterCoupon * 0.16;
   const total = subtotalAfterCoupon + iva;
 
   const renderFooterMessage = () => {
@@ -77,6 +75,14 @@ const CheckoutScreen = () => {
     }
   };
 
+  const handleGoBack = () => {
+    if (currentStep === 1) {
+      router.back(); // Use router.back() for navigation.goBack() in Expo Router
+    } else if (currentStep > 1) {
+      setCurrentStep(currentStep - 1);
+    }
+  };
+
   const handleGoToHome = () => {
     router.replace({
       pathname: '/(tabs)',
@@ -87,7 +93,6 @@ const CheckoutScreen = () => {
     selectedOption !== null &&
     selectedPayment !== null &&
     selectedLocation !== null;
-
   const isStep2Complete =
     isSimplifiedSteps || (selectedPayment !== null && isPaymentInfoValid);
 
@@ -166,6 +171,11 @@ const CheckoutScreen = () => {
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
+        {/* Back Button */}
+        <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
+          <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
+        </TouchableOpacity>
+
         <View style={styles.steps}>
           <Steps
             totalSteps={stepsLabels.length}
@@ -256,13 +266,15 @@ const CheckoutScreen = () => {
         )}
 
         <View style={styles.whiteBackgroundContainer}>
-          <Coupon
-            onApplyCoupon={(discountAmount) => {
-              setCouponDiscount(discountAmount);
-              setIsCouponApplied(true);
-            }}
-            onCouponApplied={() => setIsCouponApplied(true)}
-          />
+          {currentStep !== 2 && currentStep < stepsLabels.length && (
+            <Coupon
+              onApplyCoupon={(discountAmount) => {
+                setCouponDiscount(discountAmount);
+                setIsCouponApplied(true);
+              }}
+              onCouponApplied={() => setIsCouponApplied(true)}
+            />
+          )}
           <OrderSummary />
           <View style={styles.totalContainer}>
             {isCouponApplied && (
@@ -323,33 +335,40 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
+  backButton: {
+    position: 'absolute',
+    top: 16,
+    left: 16,
+    zIndex: 1,
+    padding: 8,
+  },
   steps: {
-    marginTop: 40,
+    marginTop: 60,
   },
   purchaseOptionsTitle: {
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
     marginBottom: 24,
     alignSelf: 'flex-start',
-    padding: 20,
+    paddingHorizontal: 20,
   },
   radioContainer: {
     width: '100%',
-    padding: 20,
+    paddingHorizontal: 20,
     marginTop: -30,
   },
   radioItem: {
     marginBottom: 24,
   },
   paymentMethods: {
-    padding: 20,
+    paddingHorizontal: 20,
   },
   footerMessage: {
     fontSize: FontSizes.c1.size,
     color: Colors.textLowContrast,
-    marginBottom: -20,
-    padding: 20,
-    marginTop: -20,
+    marginBottom: 10,
+    paddingHorizontal: 20,
+    marginTop: 10,
   },
   whiteBackgroundContainer: {
     backgroundColor: '#FFFFFF',
@@ -364,7 +383,6 @@ const styles = StyleSheet.create({
   },
   totalContainer: {
     width: '100%',
-
     marginBottom: 10,
   },
   totalRow: {
@@ -409,7 +427,7 @@ const styles = StyleSheet.create({
     marginBottom: -20,
   },
   paymentInfoFormContainer: {
-    padding: 20,
+    paddingHorizontal: 20,
     paddingTop: 0,
   },
   confirmationContainer: {

From 64f46fdf9608da3885856c1e6b68dcd7c99c1db5 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 17 Apr 2025 15:39:23 -0400
Subject: [PATCH 106/291] Finishing delivery design

---
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 src/app/_layout.tsx                           |   5 +
 src/app/deliveryDetail/[id].tsx               |   2 +
 src/app/deliveryDetail/_layout.tsx            |  30 ++
 src/app/deliveryHistoryDetail/[id].tsx        |   2 +
 src/app/deliveryHistoryDetail/_layout.tsx     |  30 ++
 src/components/HistoryOrderCard.tsx           |   7 +-
 src/components/OrderCard.tsx                  |   7 +-
 src/screens/delivery/DeliveryDetailScreen.tsx | 363 ++++++++++++++
 .../delivery/DeliveryHistoryDetailScreen.tsx  | 449 ++++++++++++++++++
 .../delivery/DeliveryHistoryScreen.tsx        |  39 +-
 src/screens/delivery/DeliveryHomeScreen.tsx   |  17 +-
 src/styles/theme.ts                           |   1 +
 14 files changed, 933 insertions(+), 29 deletions(-)
 create mode 100644 src/app/deliveryDetail/[id].tsx
 create mode 100644 src/app/deliveryDetail/_layout.tsx
 create mode 100644 src/app/deliveryHistoryDetail/[id].tsx
 create mode 100644 src/app/deliveryHistoryDetail/_layout.tsx
 create mode 100644 src/screens/delivery/DeliveryDetailScreen.tsx
 create mode 100644 src/screens/delivery/DeliveryHistoryDetailScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index 73d30a1..8110c6b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.2",
+        "@pharmatech/sdk": "^0.4.1",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
-      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
+      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index fb7e659..a37420a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.2",
+    "@pharmatech/sdk": "^0.4.1",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 185efae..7142d01 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -102,6 +102,11 @@ export default function RootLayout() {
           options={{ headerTitle: '', headerTransparent: true }}
         />
         <Stack.Screen name="(delivery-tabs)" options={{ headerShown: false }} />
+        <Stack.Screen name="deliveryDetail" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="deliveryHistoryDetail"
+          options={{ headerShown: false }}
+        />
       </Stack>
     </Provider>
   );
diff --git a/src/app/deliveryDetail/[id].tsx b/src/app/deliveryDetail/[id].tsx
new file mode 100644
index 0000000..6f8a55f
--- /dev/null
+++ b/src/app/deliveryDetail/[id].tsx
@@ -0,0 +1,2 @@
+import DeliveryDetailScreen from '../../screens/delivery/DeliveryDetailScreen';
+export default DeliveryDetailScreen;
diff --git a/src/app/deliveryDetail/_layout.tsx b/src/app/deliveryDetail/_layout.tsx
new file mode 100644
index 0000000..d387e61
--- /dev/null
+++ b/src/app/deliveryDetail/_layout.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Stack } from 'expo-router';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+
+export default function DeliveryDetailLayout() {
+  return (
+    <Stack
+      screenOptions={({ navigation }) => ({
+        headerShown: true,
+        headerTransparent: true,
+        headerTitle: '',
+        headerLeft: () =>
+          navigation.canGoBack() ? (
+            <View style={styles.iconContainer}>
+              <TouchableOpacity onPress={navigation.goBack}>
+                <ChevronLeftIcon width={24} height={24} color="#000" />
+              </TouchableOpacity>
+            </View>
+          ) : null,
+      })}
+    />
+  );
+}
+
+const styles = StyleSheet.create({
+  iconContainer: {
+    marginLeft: -8,
+  },
+});
diff --git a/src/app/deliveryHistoryDetail/[id].tsx b/src/app/deliveryHistoryDetail/[id].tsx
new file mode 100644
index 0000000..c7fb885
--- /dev/null
+++ b/src/app/deliveryHistoryDetail/[id].tsx
@@ -0,0 +1,2 @@
+import DeliveryHistoryDetailScreen from '../../screens/delivery/DeliveryHistoryDetailScreen';
+export default DeliveryHistoryDetailScreen;
diff --git a/src/app/deliveryHistoryDetail/_layout.tsx b/src/app/deliveryHistoryDetail/_layout.tsx
new file mode 100644
index 0000000..d387e61
--- /dev/null
+++ b/src/app/deliveryHistoryDetail/_layout.tsx
@@ -0,0 +1,30 @@
+import React from 'react';
+import { TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Stack } from 'expo-router';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+
+export default function DeliveryDetailLayout() {
+  return (
+    <Stack
+      screenOptions={({ navigation }) => ({
+        headerShown: true,
+        headerTransparent: true,
+        headerTitle: '',
+        headerLeft: () =>
+          navigation.canGoBack() ? (
+            <View style={styles.iconContainer}>
+              <TouchableOpacity onPress={navigation.goBack}>
+                <ChevronLeftIcon width={24} height={24} color="#000" />
+              </TouchableOpacity>
+            </View>
+          ) : null,
+      })}
+    />
+  );
+}
+
+const styles = StyleSheet.create({
+  iconContainer: {
+    marginLeft: -8,
+  },
+});
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index f813c16..c7f17b2 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import {
   MapPinIcon,
-  BuildingOfficeIcon,
   ClockIcon,
+  BuildingStorefrontIcon,
 } from 'react-native-heroicons/outline';
 import { CheckCircleIcon } from 'react-native-heroicons/solid';
 import Badge from './Badge';
@@ -67,7 +67,7 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           <PoppinsText style={styles.detailText}>{userName}</PoppinsText>
         </View>
         <View style={styles.detailRow}>
-          <BuildingOfficeIcon size={20} color={Colors.primary} />
+          <BuildingStorefrontIcon size={20} color={Colors.primary} />
           <PoppinsText style={styles.detailText}>
             Buscar en: {branch}
           </PoppinsText>
@@ -102,7 +102,8 @@ const styles = StyleSheet.create({
     shadowRadius: 4,
     elevation: 2,
     width: '100%',
-    height: 280,
+    minHeight: 280,
+    flexGrow: 1,
   },
   header: {
     flexDirection: 'row',
diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
index 0299b25..b4002b5 100644
--- a/src/components/OrderCard.tsx
+++ b/src/components/OrderCard.tsx
@@ -2,8 +2,8 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import {
   MapPinIcon,
-  BuildingOfficeIcon,
   ClockIcon,
+  BuildingStorefrontIcon,
 } from 'react-native-heroicons/outline';
 import Badge from './Badge';
 import Button from './Button';
@@ -59,7 +59,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
           <PoppinsText style={styles.detailText}>{address}</PoppinsText>
         </View>
         <View style={styles.detailRow}>
-          <BuildingOfficeIcon size={20} color={Colors.primary} />
+          <BuildingStorefrontIcon size={20} color={Colors.primary} />
           <PoppinsText style={styles.detailText}>
             Buscar en: {branch}
           </PoppinsText>
@@ -104,7 +104,8 @@ const styles = StyleSheet.create({
     shadowRadius: 4,
     elevation: 2,
     width: '100%',
-    height: 300,
+    minHeight: 300,
+    flexGrow: 1,
   },
   header: {
     flexDirection: 'row',
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
new file mode 100644
index 0000000..b9f8a80
--- /dev/null
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -0,0 +1,363 @@
+import React, { useState } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { useLocalSearchParams } from 'expo-router';
+import {
+  InformationCircleIcon,
+  BuildingStorefrontIcon,
+  MapPinIcon,
+  PhoneIcon,
+  EnvelopeIcon,
+} from 'react-native-heroicons/solid';
+import Badge from '../../components/Badge';
+import PoppinsText from '../../components/PoppinsText';
+import Button from '../../components/Button';
+import { Colors, FontSizes } from '../../styles/theme';
+
+interface Product {
+  id: string;
+  name: string;
+  quantity: number;
+}
+
+const DeliveryDetailScreen: React.FC = () => {
+  const { data } = useLocalSearchParams();
+
+  const orderData = data
+    ? JSON.parse(decodeURIComponent(data as string))
+    : null;
+
+  if (!orderData) {
+    return (
+      <View style={styles.errorContainer}>
+        <PoppinsText style={styles.errorText}>
+          No se encontraron datos del pedido.
+        </PoppinsText>
+      </View>
+    );
+  }
+
+  const [deliveryState, setDeliveryState] = useState(0);
+
+  const deliveryStates = [
+    'Buscando pedido en sucursal de origen',
+    'Haciendo entrega del pedido',
+  ];
+
+  const buttonStates = [
+    'Comenzar entrega',
+    'Llegué a la sucursal',
+    'Ya tengo los productos del pedido',
+    'Ir a destino de entrega',
+    'Ya hice la entrega',
+    'Finalizar entrega',
+  ];
+
+  const handleNextState = () => {
+    if (deliveryState < buttonStates.length - 1) {
+      setDeliveryState(deliveryState + 1);
+    }
+  };
+
+  return (
+    <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+      <ScrollView contentContainerStyle={styles.container}>
+        {/* Título y botón de información */}
+        <View style={styles.header}>
+          <PoppinsText style={styles.title}>Detalle del pedido</PoppinsText>
+          <InformationCircleIcon size={24} color={Colors.primary} />
+        </View>
+
+        {/* Estado del pedido */}
+        <View style={styles.statusContainer}>
+          <PoppinsText style={styles.statusLabel}>Estado:</PoppinsText>
+          <Badge
+            variant="filled"
+            color={orderData.type === 'pedido' ? 'info' : 'secondary_300'}
+            size="small"
+            borderRadius="square"
+            textColor={Colors.primary}
+          >
+            {deliveryStates[deliveryState < 3 ? 0 : 1]}
+          </Badge>
+        </View>
+
+        {/* Ubicaciones del pedido */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Ubicaciones del pedido
+        </PoppinsText>
+        <View style={styles.locationsContainer}>
+          {/* Círculo superior */}
+          <View style={styles.circleTop} />
+
+          {/* Línea vertical punteada */}
+          <View style={styles.verticalLine} />
+
+          {/* Círculo inferior */}
+          <View style={styles.circleBottom} />
+
+          {/* Primera carta */}
+          <View style={styles.card}>
+            <View style={styles.cardRow}>
+              <BuildingStorefrontIcon
+                size={20}
+                color={Colors.primary}
+                style={styles.icon}
+              />
+              <PoppinsText style={styles.cardTitle}>
+                {orderData.branch}
+              </PoppinsText>
+            </View>
+            <PoppinsText style={styles.cardSubtitle}>
+              {orderData.address}
+            </PoppinsText>
+          </View>
+
+          {/* Segunda carta */}
+          <View style={styles.card2}>
+            <View style={styles.cardRow}>
+              <MapPinIcon
+                size={20}
+                color={Colors.primary}
+                style={styles.icon}
+              />
+              <PoppinsText style={styles.cardTitle}>Entrega</PoppinsText>
+            </View>
+            <PoppinsText style={styles.cardSubtitle}>
+              {orderData.address}
+            </PoppinsText>
+          </View>
+        </View>
+
+        {/* Información de contacto */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Información de contacto
+        </PoppinsText>
+        <View style={styles.card3}>
+          {/* Teléfono */}
+          <View style={styles.cardRow}>
+            <PhoneIcon size={20} color={Colors.primary} style={styles.icon} />
+            <PoppinsText style={styles.cardSubtitle1}>+123456789</PoppinsText>
+          </View>
+
+          {/* Correo */}
+          <View style={styles.cardRow}>
+            <EnvelopeIcon
+              size={20}
+              color={Colors.primary}
+              style={styles.icon}
+            />
+            <PoppinsText style={styles.cardSubtitle1}>
+              cliente@correo.com
+            </PoppinsText>
+          </View>
+        </View>
+
+        {/* Recorrido de entrega */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Recorrido de entrega
+        </PoppinsText>
+        <View style={styles.mapPlaceholder} />
+
+        {/* Pedido */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Pedido
+        </PoppinsText>
+        <PoppinsText style={styles.totalProducts}>
+          Total: {orderData.products?.length || 0} productos
+        </PoppinsText>
+        {orderData.products?.map((product: Product) => (
+          <View key={product.id} style={styles.productCard}>
+            <View style={styles.productImagePlaceholder} />
+            <View>
+              <PoppinsText style={styles.productName}>
+                {product.name}
+              </PoppinsText>
+              <PoppinsText style={styles.productQuantity}>
+                Cantidad: {product.quantity}
+              </PoppinsText>
+            </View>
+          </View>
+        ))}
+
+        {/* Espaciado adicional al final */}
+        <View style={styles.scrollSpacer} />
+      </ScrollView>
+
+      {/* Botón flotante */}
+      <Button
+        title={buttonStates[deliveryState]}
+        variant="primary"
+        size="medium"
+        onPress={handleNextState}
+        style={styles.floatingButton}
+      />
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  header: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 16,
+  },
+  title: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+  },
+  container: {
+    marginTop: 32,
+    padding: 16,
+  },
+  statusContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 16,
+  },
+  statusLabel: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.primary,
+  },
+  sectionTitle: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    color: Colors.primary,
+    marginBottom: 8,
+  },
+  locationsContainer: {
+    position: 'relative',
+    marginBottom: 16,
+    paddingLeft: 0,
+  },
+  verticalLine: {
+    position: 'absolute',
+    left: 4,
+    top: '25%',
+    height: '50%',
+    borderStyle: 'dashed',
+    borderWidth: 2,
+    borderColor: Colors.primary_300,
+  },
+  circleTop: {
+    position: 'absolute',
+    left: 0,
+    top: '25%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_300,
+    transform: [{ translateY: -4 }],
+  },
+  circleBottom: {
+    position: 'absolute',
+    left: 0,
+    top: '75%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_300,
+    transform: [{ translateY: -4 }],
+  },
+  card: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+    marginLeft: 28,
+    flex: 1,
+  },
+  card2: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginLeft: 28,
+    flex: 1,
+  },
+  card3: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    paddingBottom: 8,
+    marginBottom: 16,
+    flex: 1,
+  },
+  cardRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  icon: {
+    marginRight: 6,
+  },
+  cardTitle: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+  },
+  cardSubtitle: {
+    fontSize: FontSizes.label.size,
+    color: Colors.textMain,
+  },
+  cardSubtitle1: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.textMain,
+  },
+  mapPlaceholder: {
+    height: 300,
+    backgroundColor: Colors.gray_100,
+    borderRadius: 16,
+    marginBottom: 16,
+  },
+  totalProducts: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textMain,
+    marginBottom: 8,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+  },
+  productImagePlaceholder: {
+    width: 50,
+    height: 50,
+    backgroundColor: Colors.gray_100,
+    borderRadius: 8,
+    marginRight: 16,
+  },
+  productName: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textMain,
+  },
+  productQuantity: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+  },
+  floatingButton: {
+    position: 'absolute',
+    bottom: 16,
+    left: 16,
+    right: 16,
+  },
+  errorContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  errorText: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.semanticDanger,
+  },
+  scrollSpacer: {
+    height: 64,
+  },
+});
+
+export default DeliveryDetailScreen;
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
new file mode 100644
index 0000000..cfcee65
--- /dev/null
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -0,0 +1,449 @@
+import React from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { useLocalSearchParams } from 'expo-router';
+import { PhoneIcon, EnvelopeIcon } from 'react-native-heroicons/solid';
+import Badge from '../../components/Badge';
+import PoppinsText from '../../components/PoppinsText';
+import { Colors, FontSizes } from '../../styles/theme';
+import Avatar from '../../components/Avatar';
+
+interface Product {
+  id: string;
+  name: string;
+  quantity: number;
+}
+
+const DeliveryHistoryDetailScreen: React.FC = () => {
+  const { data } = useLocalSearchParams();
+
+  console.log(
+    'Datos recibidos en la pantalla del historial (sin procesar):',
+    data,
+  );
+
+  const orderData = data
+    ? JSON.parse(decodeURIComponent(data as string))
+    : null;
+
+  console.log('Datos decodificados en la pantalla del historial:', orderData);
+
+  if (!orderData) {
+    return (
+      <View style={styles.errorContainer}>
+        <PoppinsText style={styles.errorText}>
+          No se encontraron datos del pedido.
+        </PoppinsText>
+      </View>
+    );
+  }
+
+  return (
+    <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+      <ScrollView contentContainerStyle={styles.container}>
+        <View style={styles.header}>
+          <PoppinsText style={styles.title}>Resumen del pedido</PoppinsText>
+        </View>
+        {/* Badge con información del historial */}
+        <View style={styles.statusContainer}>
+          <Badge
+            variant="filled"
+            color="primary_300"
+            size="small"
+            borderRadius="square"
+          >
+            {`${orderData.elapsedTime}, ${orderData.completionTime}`}
+          </Badge>
+        </View>
+
+        {/* Información combinada en una sola carta */}
+        <View style={styles.combinedCard}>
+          {/* Información del cliente */}
+          <View style={styles.cardRow}>
+            <View style={styles.avatar}>
+              <Avatar />
+            </View>
+            <PoppinsText weight="medium" style={styles.userName}>
+              {orderData.userName}
+            </PoppinsText>
+          </View>
+          <View style={styles.cardRow}>
+            <PhoneIcon size={20} color={Colors.primary} style={styles.icon} />
+            <PoppinsText style={styles.cardSubtitle}>+123456789</PoppinsText>
+          </View>
+          <View style={styles.cardRow}>
+            <EnvelopeIcon
+              size={20}
+              color={Colors.primary}
+              style={styles.icon}
+            />
+            <PoppinsText style={styles.cardSubtitle}>
+              cliente@correo.com
+            </PoppinsText>
+          </View>
+
+          <View style={styles.spacing} />
+
+          {/* Contenedor de la información de la sucursal */}
+          <View style={styles.info}>
+            {/* Línea vertical punteada */}
+            <View style={styles.circleTop} />
+
+            {/* Línea vertical punteada */}
+            <View style={styles.verticalLine} />
+
+            {/* Círculo inferior */}
+            <View style={styles.circleBottom} />
+
+            <View style={styles.sectionContainer}>
+              <View style={styles.cardRow}>
+                <PoppinsText style={styles.cardTitle}>
+                  {orderData.branch}
+                </PoppinsText>
+              </View>
+              <PoppinsText style={styles.cardSubtitle}>
+                {orderData.address}
+              </PoppinsText>
+            </View>
+
+            {/* Contenedor de la información de la entrega */}
+            <View style={styles.sectionContainerB}>
+              <View style={styles.cardRow}>
+                <PoppinsText style={styles.cardTitle}>Entrega</PoppinsText>
+              </View>
+              <PoppinsText style={styles.cardSubtitle}>
+                {orderData.address}
+              </PoppinsText>
+            </View>
+          </View>
+        </View>
+
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Historial de la entrega
+        </PoppinsText>
+
+        <View style={styles.combinedCardHistory}>
+          {/* Contenedor de la información de la sucursal */}
+          <View style={styles.info}>
+            {/* Línea vertical punteada */}
+            <View style={styles.verticalLineHistory} />
+
+            {/* Línea vertical punteada */}
+            <View style={styles.circleTopHistory} />
+
+            {/* Círculo middle */}
+            <View style={styles.circleMiddleHistory} />
+
+            {/* Círculo inferior */}
+            <View style={styles.circleBottomHistory} />
+
+            <View style={styles.sectionContainer}>
+              <View style={styles.cardRow}>
+                <PoppinsText style={styles.historyTitle}>
+                  Pedido iniciado
+                </PoppinsText>
+              </View>
+              <PoppinsText
+                style={styles.historySubtitle}
+              >{`${orderData.elapsedTime}, ${orderData.completionTime}`}</PoppinsText>
+            </View>
+
+            <View style={styles.sectionContainer}>
+              <View style={styles.cardRow}>
+                <PoppinsText style={styles.historyTitle}>
+                  Pedido recogido
+                </PoppinsText>
+              </View>
+              <PoppinsText style={styles.historySubtitle}>
+                {`${orderData.elapsedTime}`}, hora de recogida
+              </PoppinsText>
+            </View>
+
+            <View style={styles.sectionContainerB}>
+              <View style={styles.cardRow}>
+                <PoppinsText style={styles.historyTitle}>Entregado</PoppinsText>
+              </View>
+              <PoppinsText style={styles.historySubtitle}>
+                {`${orderData.elapsedTime}`}, hora de entrega
+              </PoppinsText>
+            </View>
+          </View>
+        </View>
+
+        {/* Recorrido de entrega */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Recorrido de entrega
+        </PoppinsText>
+        <View style={styles.mapPlaceholder} />
+
+        {/* Pedido */}
+        <PoppinsText weight="medium" style={styles.sectionTitle}>
+          Pedido
+        </PoppinsText>
+        <PoppinsText style={styles.totalProducts}>
+          Total: {orderData.products?.length || 0} productos
+        </PoppinsText>
+        {orderData.products?.map((product: Product) => (
+          <View key={product.id} style={styles.productCard}>
+            <View style={styles.productImagePlaceholder} />
+            <View>
+              <PoppinsText style={styles.productName}>
+                {product.name}
+              </PoppinsText>
+              <PoppinsText style={styles.productQuantity}>
+                Cantidad: {product.quantity}
+              </PoppinsText>
+            </View>
+          </View>
+        ))}
+        <View style={styles.scrollSpacer} />
+      </ScrollView>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  header: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 12,
+  },
+  title: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+  },
+  container: {
+    marginTop: 32,
+    padding: 16,
+  },
+  statusContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 16,
+  },
+  statusLabel: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.textMain,
+  },
+  sectionTitle: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    color: Colors.primary,
+    marginBottom: 8,
+  },
+  locationsContainer: {
+    position: 'relative',
+    marginBottom: 16,
+    paddingLeft: 0,
+  },
+  verticalLine: {
+    position: 'absolute',
+    left: -12,
+    top: '25%',
+    height: '50%',
+    width: 2,
+    borderStyle: 'dashed',
+    borderWidth: 2,
+    borderColor: Colors.primary_300,
+  },
+  circleTop: {
+    position: 'absolute',
+    left: -16,
+    top: '25%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_300,
+    transform: [{ translateY: -8 }],
+  },
+  circleBottom: {
+    position: 'absolute',
+    left: -16,
+    top: '75%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_300,
+    transform: [{ translateY: -2 }],
+  },
+  verticalLineHistory: {
+    position: 'absolute',
+    left: -12,
+    top: '15%',
+    height: '75%',
+    width: 2,
+    borderWidth: 2,
+    borderColor: Colors.primary_300,
+  },
+  circleTopHistory: {
+    position: 'absolute',
+    left: -16,
+    top: '25%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_700,
+    transform: [{ translateY: -22 }],
+  },
+  circleMiddleHistory: {
+    position: 'absolute',
+    left: -16,
+    top: '75%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_700,
+    transform: [{ translateY: -45 }],
+  },
+  circleBottomHistory: {
+    position: 'absolute',
+    left: -16,
+    top: '75%',
+    width: 12,
+    height: 12,
+    borderRadius: 6,
+    backgroundColor: Colors.primary_700,
+    transform: [{ translateY: 14 }],
+  },
+  card: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+    marginLeft: 28,
+    flex: 1,
+  },
+  card2: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginLeft: 28,
+    flex: 1,
+  },
+  card3: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    paddingBottom: 8,
+    marginBottom: 16,
+    flex: 1,
+  },
+  combinedCard: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+    flex: 1,
+  },
+  combinedCardHistory: {
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+    flex: 1,
+  },
+  cardRow: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  icon: {
+    marginRight: 6,
+  },
+  avatar: {
+    marginRight: 8,
+  },
+  cardTitle: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.primary,
+    marginBottom: -6, // Reduce el espacio entre el título y el subtítulo
+  },
+  historyTitle: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.primary,
+    marginBottom: -9, // Reduce el espacio entre el título y el subtítulo
+  },
+  cardSubtitle: {
+    fontSize: FontSizes.label.size,
+    color: Colors.textMain,
+  },
+  historySubtitle: {
+    fontSize: FontSizes.label.size,
+    color: Colors.textLowContrast,
+  },
+  userName: {
+    fontSize: FontSizes.s2.size,
+    lineHeight: FontSizes.s2.lineHeight,
+    color: Colors.textMain,
+  },
+  sectionContainer: {
+    marginLeft: 4,
+    marginBottom: 16, // Espaciado entre secciones
+  },
+  sectionContainerB: {
+    marginLeft: 4,
+  },
+  spacing: {
+    marginBottom: 8, // Espaciado entre secciones
+  },
+  info: {
+    marginLeft: 18, // Espaciado entre secciones
+  },
+  mapPlaceholder: {
+    height: 300,
+    backgroundColor: Colors.gray_100,
+    borderRadius: 16,
+    marginBottom: 16,
+  },
+  totalProducts: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textMain,
+    marginBottom: 8,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+  },
+  productImagePlaceholder: {
+    width: 50,
+    height: 50,
+    backgroundColor: Colors.gray_100,
+    borderRadius: 8,
+    marginRight: 16,
+  },
+  productName: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textMain,
+  },
+  productQuantity: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+  },
+  floatingButton: {
+    position: 'absolute',
+    bottom: 16,
+    left: 16,
+    right: 16,
+  },
+  errorContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  errorText: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.semanticDanger,
+  },
+  scrollSpacer: {
+    height: 64,
+  },
+});
+
+export default DeliveryHistoryDetailScreen;
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index b7f7e3a..08d6c00 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -1,20 +1,25 @@
 import React from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
+import { useRouter } from 'expo-router';
 import PoppinsText from '../../components/PoppinsText';
 import HistoryOrderCard from '../../components/HistoryOrderCard';
 import { Colors, FontSizes } from '../../styles/theme';
 
-export default function DeliveryHistoryScreen() {
-  const completedOrders: Array<{
-    id: string;
-    type: 'pedido' | 'reubicación';
-    address: string;
-    branch: string;
-    estimatedTime: string;
-    elapsedTime: string;
-    completionTime: string; // Hora de finalización
-    userName: string; // Nombre del usuario
-  }> = [
+interface Order {
+  id: string;
+  type: 'pedido' | 'reubicación';
+  address: string;
+  branch: string;
+  estimatedTime: string;
+  elapsedTime: string;
+  completionTime: string;
+  userName: string;
+}
+
+const DeliveryHistoryScreen: React.FC = () => {
+  const router = useRouter();
+
+  const completedOrders: Array<Order> = [
     {
       id: '12345',
       type: 'pedido',
@@ -37,8 +42,10 @@ export default function DeliveryHistoryScreen() {
     },
   ];
 
-  const handleViewDetails = (orderId: string) => {
-    console.log(`Ver detalles del pedido: ${orderId}`);
+  const handleViewDetails = (order: Order) => {
+    console.log('Datos enviados al detalle del historial:', order);
+    const query = encodeURIComponent(JSON.stringify(order));
+    router.push(`/deliveryHistoryDetail/${order.id}?data=${query}`);
   };
 
   return (
@@ -58,13 +65,13 @@ export default function DeliveryHistoryScreen() {
             elapsedTime={order.elapsedTime}
             completionTime={order.completionTime}
             userName={order.userName}
-            onViewDetails={() => handleViewDetails(order.id)}
+            onViewDetails={() => handleViewDetails(order)}
           />
         ))}
       </ScrollView>
     </View>
   );
-}
+};
 
 const styles = StyleSheet.create({
   container: {
@@ -80,3 +87,5 @@ const styles = StyleSheet.create({
     marginBottom: 16,
   },
 });
+
+export default DeliveryHistoryScreen;
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index 68242b2..fddcf29 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -1,10 +1,13 @@
 import React from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
+import { useRouter } from 'expo-router';
 import PoppinsText from '../../components/PoppinsText';
 import OrderCard from '../../components/OrderCard';
 import { Colors, FontSizes } from '../../styles/theme';
 
 export default function DeliveryHomeScreen() {
+  const router = useRouter();
+
   const orders: Array<{
     id: string;
     type: 'pedido' | 'reubicación';
@@ -31,8 +34,16 @@ export default function DeliveryHomeScreen() {
     },
   ];
 
-  const handleTakeOrder = (orderId: string) => {
-    console.log(`Tomar pedido: ${orderId}`);
+  const handleTakeOrder = (order: {
+    id: string;
+    type: 'pedido' | 'reubicación';
+    address: string;
+    branch: string;
+    estimatedTime: string;
+    elapsedTime: string;
+  }) => {
+    const query = encodeURIComponent(JSON.stringify(order));
+    router.push(`/deliveryDetail/${order.id}?data=${query}`);
   };
 
   const handleDiscardOrder = (orderId: string) => {
@@ -54,7 +65,7 @@ export default function DeliveryHomeScreen() {
             branch={order.branch}
             estimatedTime={order.estimatedTime}
             elapsedTime={order.elapsedTime}
-            onTakeOrder={() => handleTakeOrder(order.id)}
+            onTakeOrder={() => handleTakeOrder(order)}
             onDiscardOrder={() => handleDiscardOrder(order.id)}
           />
         ))}
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 66b4919..68ef74a 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -39,6 +39,7 @@ export const Colors = {
   secondary_300: '#8BEAB3',
 
   primary_300: '#A2BEEE',
+  primary_700: '#374CBE',
 };
 
 export const Fonts = {

From c4b96a49cb4d74e9b6983d4d6b179c867025997e Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 17 Apr 2025 16:02:52 -0400
Subject: [PATCH 107/291] small design fix

---
 src/components/HistoryOrderCard.tsx | 4 +---
 src/components/OrderCard.tsx        | 3 +--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index c7f17b2..db3e982 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -47,11 +47,10 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
         >
           {`${elapsedTime}, ${completionTime}`}
         </Badge>
-        <PoppinsText style={styles.elapsedTime}>{elapsedTime}</PoppinsText>
       </View>
 
       {/* Order Code */}
-      <PoppinsText style={styles.orderCode}>
+      <PoppinsText weight="medium" style={styles.orderCode}>
         <CheckCircleIcon size={20} color={Colors.semanticSuccess} />{' '}
         {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
       </PoppinsText>
@@ -113,7 +112,6 @@ const styles = StyleSheet.create({
   },
   orderCode: {
     fontSize: FontSizes.h5.size,
-    fontWeight: 'bold',
     color: Colors.primary,
     marginBottom: 8,
   },
diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
index b4002b5..4a621f1 100644
--- a/src/components/OrderCard.tsx
+++ b/src/components/OrderCard.tsx
@@ -48,7 +48,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
       </View>
 
       {/* Order Code */}
-      <PoppinsText style={styles.orderCode}>
+      <PoppinsText weight="medium" style={styles.orderCode}>
         {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
       </PoppinsText>
 
@@ -120,7 +120,6 @@ const styles = StyleSheet.create({
   },
   orderCode: {
     fontSize: FontSizes.h5.size,
-    fontWeight: 'bold',
     color: Colors.primary,
     marginBottom: 8,
   },

From dbf5f180a22bb4311497df4446e8ca1ab8a02416 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 17 Apr 2025 17:10:54 -0400
Subject: [PATCH 108/291] Added orders screen, changed sdk to 0.4.2, and
 updated menu with the orders option, minor changes in directionChange screen

---
 package-lock.json                     |   8 +-
 package.json                          |   2 +-
 src/app/_layout.tsx                   |   1 +
 src/app/orders.tsx                    |   2 +
 src/components/AvatarWithMenu.tsx     |   2 +-
 src/screens/DirectionChangeScreen.tsx |  10 +-
 src/screens/OrdersScreen.tsx          | 232 ++++++++++++++++++++++++++
 src/services/user.ts                  |  25 +++
 8 files changed, 271 insertions(+), 11 deletions(-)
 create mode 100644 src/app/orders.tsx
 create mode 100644 src/screens/OrdersScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index edaebc8..c6444a4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "0.4.1",
+        "@pharmatech/sdk": "^0.4.2",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
-      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
+      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index d8b20f6..589a141 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.1",
+    "@pharmatech/sdk": "^0.4.2",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 9e3d65b..1975d25 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -70,6 +70,7 @@ export default function RootLayout() {
         <Stack.Screen name="products" options={{ headerShown: false }} />
         <Stack.Screen name="profile" options={{ headerShown: false }} />
         <Stack.Screen name="direction" options={{ headerShown: false }} />
+        <Stack.Screen name="orders" options={{ headerShown: false }} />
         <Stack.Screen
           name="change-direction"
           options={{ headerShown: false }}
diff --git a/src/app/orders.tsx b/src/app/orders.tsx
new file mode 100644
index 0000000..929cce9
--- /dev/null
+++ b/src/app/orders.tsx
@@ -0,0 +1,2 @@
+import OrdersScreen from '../screens/OrdersScreen';
+export default OrdersScreen;
diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
index b01b9d2..9d90bd2 100644
--- a/src/components/AvatarWithMenu.tsx
+++ b/src/components/AvatarWithMenu.tsx
@@ -38,7 +38,7 @@ const AvatarWithMenu: React.FC = () => {
       id: '4',
       title: 'Mis Pedidos',
       icon: <ShoppingCartIcon color={Colors.iconMainPrimary} />,
-      onPress: () => console.log('Cerrar sesión presionado'),
+      onPress: () => router.push('/orders'),
     },
   ];
 
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 081c8b6..74df82f 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -135,7 +135,7 @@ const ChangeDirectionScreen = () => {
       </View>
       {/* Header */}
       <Return onClose={() => router.push('/')} />
-      <View style={styles.profileHeader}>
+      <View style={styles.addressHeader}>
         {isEditable ? (
           <PoppinsText
             style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}
@@ -152,7 +152,7 @@ const ChangeDirectionScreen = () => {
       </View>
 
       {/* Información de direccion */}
-      <View style={styles.profileInfo}>
+      <View style={styles.addressInfo}>
         {isEditable ? (
           <Dropdown
             label="Estado"
@@ -264,11 +264,11 @@ const styles = StyleSheet.create({
     right: 0,
     zIndex: 1000,
   },
-  profileHeader: {
+  addressHeader: {
     alignItems: 'center',
     marginVertical: 15,
   },
-  profileImage: {
+  addressImage: {
     width: 120,
     height: 120,
     borderRadius: 60,
@@ -284,7 +284,7 @@ const styles = StyleSheet.create({
   editButtonText: {
     color: Colors.primary,
   },
-  profileInfo: {
+  addressInfo: {
     marginBottom: 20,
   },
   fieldContainer: {
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
new file mode 100644
index 0000000..cb9e362
--- /dev/null
+++ b/src/screens/OrdersScreen.tsx
@@ -0,0 +1,232 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Return from '../components/Return';
+import { Link, useRouter } from 'expo-router';
+import Alert from '../components/Alerts';
+import Button from '../components/Button';
+
+type order = {
+  id: string;
+  date: string;
+  status: string;
+  total: number;
+};
+
+const OrdersScreen = () => {
+  const [ordersList, setOrdersList] = useState<order[] | undefined>(undefined);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showInfoAlert, setShowInfoAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchOrders = async () => {
+      try {
+        /* const order = await UserService.getUserOrders();
+
+        if (order.success) {
+          if (order.data.length > 0) {
+            setOrdersList(order.data);
+          } else {
+            setShowInfoAlert(true);
+          }
+        } */
+        setOrdersList([
+          {
+            id: '#R353453',
+            date: '43534543',
+            status: 'Pagado',
+            total: 12.45,
+          },
+          {
+            id: '#R353453',
+            date: '43534543',
+            status: 'Pagado',
+            total: 12.45,
+          },
+        ]);
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ha ocurrido un error');
+        setShowErrorAlert(true);
+      }
+    };
+
+    fetchOrders();
+  }, []);
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showInfoAlert && (
+          <Alert
+            type="info"
+            title="No tiene pedidos"
+            message="No tiene pedidos"
+            onClose={() => {
+              setShowInfoAlert(false);
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      <Return onClose={() => router.push('/')} />
+      <View style={styles.orderHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
+          Mis Pedidos
+        </PoppinsText>
+      </View>
+
+      <View style={styles.orderInfo}>
+        {ordersList &&
+          ordersList.length > 0 &&
+          ordersList.map((order, index) => (
+            <View
+              key={index}
+              style={{
+                flexDirection: 'row',
+                paddingHorizontal: 10,
+                borderWidth: 1,
+                borderColor: Colors.gray_100,
+                marginVertical: 5,
+                backgroundColor: Colors.textWhite,
+                borderRadius: 10,
+              }}
+            >
+              <View style={{ paddingVertical: 10, flex: 1 }}>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                  }}
+                >
+                  <View>
+                    <PoppinsText>{order.id}</PoppinsText>
+                    <PoppinsText style={{ color: Colors.textLowContrast }}>
+                      {order.date}
+                    </PoppinsText>
+                  </View>
+                  <PoppinsText>${order.total}</PoppinsText>
+                </View>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    marginTop: 5,
+                  }}
+                >
+                  <PoppinsText
+                    style={{
+                      padding: 5,
+                      backgroundColor: Colors.semanticDanger,
+                      borderRadius: 5,
+                      width: 80,
+                      textAlign: 'center',
+                      color: Colors.textWhite,
+                      fontSize: FontSizes.c1.size,
+                    }}
+                  >
+                    {order.status}
+                  </PoppinsText>
+                  <View
+                    style={{
+                      flexDirection: 'row',
+                      justifyContent: 'space-between',
+                      alignItems: 'center',
+                    }}
+                  >
+                    <Link href={`orders/${order.id}`}>Ver detalles</Link>
+                    <Button
+                      title="Re ordenar"
+                      size="small"
+                      style={{ marginLeft: 20, paddingVertical: 0 }}
+                    />
+                  </View>
+                </View>
+              </View>
+            </View>
+          ))}
+      </View>
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  orderHeader: {
+    alignItems: 'center',
+    marginBottom: 15,
+  },
+  orderImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  orderInfo: {
+    marginVertical: 5,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
+
+export default OrdersScreen;
diff --git a/src/services/user.ts b/src/services/user.ts
index 88b93cb..b647099 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -187,4 +187,29 @@ export const UserService = {
       };
     }
   },
+
+  getUserOrders: async () => {
+    try {
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Decodifica el JWT para obtener el userId
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      const response = await api.userAdress.getListAddresses(userId, token);
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From e1f656176a8ed0eb488ff5b9ace9108bca356a1d Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 17 Apr 2025 23:53:50 -0400
Subject: [PATCH 109/291] Created order detail screen, updated sdk to 0.4.3,
 updated menu

---
 package-lock.json                 |   8 +-
 package.json                      |   2 +-
 src/app/_layout.tsx               |   1 +
 src/app/order/[id].tsx            |   2 +
 src/app/order/_layout.tsx         |  12 ++
 src/screens/OrderDetailScreen.tsx | 216 ++++++++++++++++++++++++++++++
 src/screens/OrdersScreen.tsx      |  12 +-
 7 files changed, 245 insertions(+), 8 deletions(-)
 create mode 100644 src/app/order/[id].tsx
 create mode 100644 src/app/order/_layout.tsx
 create mode 100644 src/screens/OrderDetailScreen.tsx

diff --git a/package-lock.json b/package-lock.json
index c6444a4..ca606cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.2",
+        "@pharmatech/sdk": "^0.4.3",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.2.tgz",
-      "integrity": "sha512-L5sh0q+qPLPEl/LL5M4v+0bFyHu0/xh4rVapsF3t4IbvwWdYESNtOBNFl4wCrbC52fRO4rnLyekKPBmQc+q/Og==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
+      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 589a141..b7daf06 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.2",
+    "@pharmatech/sdk": "^0.4.3",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 1975d25..b32542c 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -71,6 +71,7 @@ export default function RootLayout() {
         <Stack.Screen name="profile" options={{ headerShown: false }} />
         <Stack.Screen name="direction" options={{ headerShown: false }} />
         <Stack.Screen name="orders" options={{ headerShown: false }} />
+        <Stack.Screen name="order" options={{ headerShown: false }} />
         <Stack.Screen
           name="change-direction"
           options={{ headerShown: false }}
diff --git a/src/app/order/[id].tsx b/src/app/order/[id].tsx
new file mode 100644
index 0000000..0645eb6
--- /dev/null
+++ b/src/app/order/[id].tsx
@@ -0,0 +1,2 @@
+import OrderDetailScreen from '../../screens/OrderDetailScreen';
+export default OrderDetailScreen;
diff --git a/src/app/order/_layout.tsx b/src/app/order/_layout.tsx
new file mode 100644
index 0000000..365a7bd
--- /dev/null
+++ b/src/app/order/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function OrdersLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
new file mode 100644
index 0000000..d37a55b
--- /dev/null
+++ b/src/screens/OrderDetailScreen.tsx
@@ -0,0 +1,216 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Button from '../components/Button';
+import { UserList } from '../types/api';
+import Return from '../components/Return';
+import { useRouter } from 'expo-router';
+import { StarIcon } from 'react-native-heroicons/solid';
+import Alert from '../components/Alerts';
+
+const OrderDetailScreen = () => {
+  const [order, setOrder] = useState<UserList>({});
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchOrder = async () => {
+      try {
+        //const order = await UserService.getOrder();
+
+        if (order.success) {
+          setOrder(order.data);
+        }
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ocurrio un error');
+      }
+    };
+
+    fetchOrder();
+  }, []);
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Cuenta creada correctamente"
+            onClose={() => {
+              setShowSuccessAlert(false);
+              router.replace('/success');
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      <Return onClose={() => router.push('/')} />
+      <View style={styles.orderHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}>
+          Detalle del pedido
+        </PoppinsText>
+      </View>
+
+      <View style={styles.orderInfo}>
+        <View
+          style={{
+            flexDirection: 'row',
+            justifyContent: 'space-between',
+            borderBottomWidth: 1,
+            borderColor: Colors.gray_100,
+            paddingHorizontal: 10,
+            paddingVertical: 20,
+          }}
+        >
+          <View>
+            <PoppinsText>Número de pedido:</PoppinsText>
+            <PoppinsText>#430960</PoppinsText>
+          </View>
+          <Button
+            title="Re ordenar"
+            size="small"
+            style={{ paddingVertical: 0 }}
+          />
+        </View>
+        <View>
+          <View style={{ flexDirection: 'row', marginVertical: 10 }}>
+            <View
+              style={{
+                width: 100,
+                backgroundColor: Colors.gray_100,
+                marginRight: 5,
+                borderRadius: 10,
+              }}
+            ></View>
+            <View style={{ flex: 1 }}>
+              <PoppinsText>Omeprazol</PoppinsText>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  margin: 10,
+                }}
+              >
+                <PoppinsText>$5.00</PoppinsText>
+                <PoppinsText>Cantidad: 1</PoppinsText>
+              </View>
+              <View style={{ flexDirection: 'row', alignContent: 'center' }}>
+                <StarIcon color={Colors.gray_100} />
+                <TouchableOpacity>
+                  <PoppinsText>Ir al producto</PoppinsText>
+                </TouchableOpacity>
+              </View>
+            </View>
+          </View>
+        </View>
+        <View style={{ marginHorizontal: 20 }}>
+          <View
+            style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+          >
+            <PoppinsText>Subtotal</PoppinsText>
+            <PoppinsText>$0</PoppinsText>
+          </View>
+          <View
+            style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+          >
+            <PoppinsText>Descuentos</PoppinsText>
+            <PoppinsText>-$0</PoppinsText>
+          </View>
+          <View
+            style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+          >
+            <PoppinsText>IVA</PoppinsText>
+            <PoppinsText>$0</PoppinsText>
+          </View>
+          <View
+            style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+          >
+            <PoppinsText>Total</PoppinsText>
+            <PoppinsText>$0</PoppinsText>
+          </View>
+        </View>
+      </View>
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  orderHeader: {
+    alignItems: 'center',
+    marginBottom: 15,
+  },
+  orderImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  orderInfo: {
+    marginBottom: 20,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
+
+export default OrderDetailScreen;
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index cb9e362..9818e1b 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -1,9 +1,9 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Return from '../components/Return';
-import { Link, useRouter } from 'expo-router';
+import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 import Button from '../components/Button';
 
@@ -148,7 +148,13 @@ const OrdersScreen = () => {
                       alignItems: 'center',
                     }}
                   >
-                    <Link href={`orders/${order.id}`}>Ver detalles</Link>
+                    <TouchableOpacity
+                      onPress={() => router.push(`order/${order.id}`)}
+                    >
+                      <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
+                        Ver detalles
+                      </PoppinsText>
+                    </TouchableOpacity>
                     <Button
                       title="Re ordenar"
                       size="small"

From baebc87ef09a6f174a45898e59f76128e4a7ede7 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Fri, 18 Apr 2025 01:00:39 -0400
Subject: [PATCH 110/291] Integrate change-password to profile menu, update
 user orders service

---
 src/components/AvatarWithMenu.tsx |  2 +-
 src/screens/OrdersScreen.tsx      | 43 ++++++++++---------------------
 src/services/user.ts              | 11 ++++++--
 src/types/api.d.ts                |  6 +++++
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
index 9d90bd2..92624ab 100644
--- a/src/components/AvatarWithMenu.tsx
+++ b/src/components/AvatarWithMenu.tsx
@@ -32,7 +32,7 @@ const AvatarWithMenu: React.FC = () => {
       id: '3',
       title: 'Seguridad',
       icon: <ShieldCheckIcon color={Colors.iconMainPrimary} />,
-      onPress: () => console.log('Cerrar sesión presionado'),
+      onPress: () => router.push('/change-password'),
     },
     {
       id: '4',
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 9818e1b..0ae703e 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -6,16 +6,13 @@ import Return from '../components/Return';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 import Button from '../components/Button';
-
-type order = {
-  id: string;
-  date: string;
-  status: string;
-  total: number;
-};
+import { UserService } from '../services/user';
+import { OrderResponse } from '../types/api';
 
 const OrdersScreen = () => {
-  const [ordersList, setOrdersList] = useState<order[] | undefined>(undefined);
+  const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
+    undefined,
+  );
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showInfoAlert, setShowInfoAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -24,29 +21,15 @@ const OrdersScreen = () => {
   useEffect(() => {
     const fetchOrders = async () => {
       try {
-        /* const order = await UserService.getUserOrders();
-
+        const order = await UserService.getUserOrders();
+        console.log(order);
         if (order.success) {
-          if (order.data.length > 0) {
-            setOrdersList(order.data);
+          if (order.data.results.length > 0) {
+            setOrdersList(order.data.results);
           } else {
             setShowInfoAlert(true);
           }
-        } */
-        setOrdersList([
-          {
-            id: '#R353453',
-            date: '43534543',
-            status: 'Pagado',
-            total: 12.45,
-          },
-          {
-            id: '#R353453',
-            date: '43534543',
-            status: 'Pagado',
-            total: 12.45,
-          },
-        ]);
+        }
       } catch (error) {
         console.log(error);
         setErrorMessage('Ha ocurrido un error');
@@ -113,12 +96,12 @@ const OrdersScreen = () => {
                   }}
                 >
                   <View>
-                    <PoppinsText>{order.id}</PoppinsText>
+                    <PoppinsText>{order.type}</PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
-                      {order.date}
+                      {order.createdAt}
                     </PoppinsText>
                   </View>
-                  <PoppinsText>${order.total}</PoppinsText>
+                  <PoppinsText>${order.totalPrice}</PoppinsText>
                 </View>
                 <View
                   style={{
diff --git a/src/services/user.ts b/src/services/user.ts
index b647099..5cd69b2 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -9,6 +9,7 @@ import {
 } from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
+import { OrderResponse, Pagination } from '@pharmatech/sdk';
 
 export const UserService = {
   getProfile: async (): Promise<ServiceResponse<UserList>> => {
@@ -188,7 +189,9 @@ export const UserService = {
     }
   },
 
-  getUserOrders: async () => {
+  getUserOrders: async (): Promise<
+    ServiceResponse<Pagination<OrderResponse>>
+  > => {
     try {
       // Obtén el token JWT desde SecureStore
       const token = await SecureStore.getItemAsync('auth_token');
@@ -203,7 +206,11 @@ export const UserService = {
       }
 
       const userId = decoded.userId;
-      const response = await api.userAdress.getListAddresses(userId, token);
+      const response = await await api.order.findAll({
+        page: 1,
+        limit: 10,
+        userId: userId,
+      });
       return { success: true, data: response };
     } catch (error) {
       return {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 4d1ca87..f4aeedb 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -123,6 +123,12 @@ type CityResponse = {
   state: StateResponse;
 };
 
+type OrderResponse = {
+  type: OrderType;
+  status: OrderStatus;
+  totalPrice: number;
+};
+
 type Inventory = BaseModel & {
   stockQuantity: number;
   branch: BranchResponse;

From ec27e6af48f41d8bcfa2d95d891933e8a392dd18 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Fri, 18 Apr 2025 01:35:02 -0400
Subject: [PATCH 111/291] Changed return button

---
 src/app/_layout.tsx                   | 22 +++++++++++++++++-----
 src/screens/DirectionChangeScreen.tsx | 15 +++++++--------
 src/screens/DirectionScreen.tsx       |  3 +--
 src/screens/OrderDetailScreen.tsx     |  3 +--
 src/screens/OrdersScreen.tsx          |  7 ++++---
 src/screens/ProfileScreen.tsx         | 12 +-----------
 src/types/api.d.ts                    |  4 +++-
 7 files changed, 34 insertions(+), 32 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index b32542c..f91edca 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -68,13 +68,25 @@ export default function RootLayout() {
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen name="products" options={{ headerShown: false }} />
-        <Stack.Screen name="profile" options={{ headerShown: false }} />
-        <Stack.Screen name="direction" options={{ headerShown: false }} />
-        <Stack.Screen name="orders" options={{ headerShown: false }} />
-        <Stack.Screen name="order" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="profile"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="direction"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="orders"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="order"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
         <Stack.Screen
           name="change-direction"
-          options={{ headerShown: false }}
+          options={{ headerTitle: '', headerTransparent: true }}
         />
         <Stack.Screen
           name="register"
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 74df82f..eff562a 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -6,21 +6,21 @@ import Input from '../components/Input';
 import Button from '../components/Button';
 import { UserService } from '../services/user';
 import { UserAddressResponse } from '../types/api';
-import Return from '../components/Return';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { validateRequiredFields } from '../utils/validators';
 import Alert from '../components/Alerts';
-
 import { StateService } from '../services/state';
-import { State, City } from '../types/api';
+import { State, CityResponse } from '../types/api';
 import Dropdown from '../components/Dropdown';
 
 const ChangeDirectionScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
 
-  const [address, setAddress] = useState<UserAddressResponse>({});
+  const [address, setAddress] = useState<UserAddressResponse>(
+    {} as UserAddressResponse,
+  );
   const [states, setStates] = useState<State[]>([]);
-  const [cities, setCities] = useState<City[]>([]);
+  const [cities, setCities] = useState<CityResponse[]>([]);
   const [selectedState, setSelectedState] = useState('');
   const [selectedCity, setSelectedCity] = useState('');
   const [isEditable, setIsEditable] = useState(false);
@@ -133,8 +133,6 @@ const ChangeDirectionScreen = () => {
           />
         )}
       </View>
-      {/* Header */}
-      <Return onClose={() => router.push('/')} />
       <View style={styles.addressHeader}>
         {isEditable ? (
           <PoppinsText
@@ -266,7 +264,8 @@ const styles = StyleSheet.create({
   },
   addressHeader: {
     alignItems: 'center',
-    marginVertical: 15,
+    marginTop: 30,
+    marginBottom: 15,
   },
   addressImage: {
     width: 120,
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index b33eb39..bd62c56 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -11,7 +11,6 @@ import {
   PencilIcon,
   TrashIcon,
 } from 'react-native-heroicons/outline';
-import Return from '../components/Return';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 
@@ -72,7 +71,6 @@ const DirectionScreen = () => {
         )}
       </View>
       {/* Header con foto de perfil */}
-      <Return onClose={() => router.push('/')} />
       <View style={styles.directionHeader}>
         <PoppinsText style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}>
           Mis Direcciones
@@ -163,6 +161,7 @@ const styles = StyleSheet.create({
   },
   directionHeader: {
     alignItems: 'center',
+    marginTop: 30,
     marginBottom: 15,
   },
   directionImage: {
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index d37a55b..d4b7fe3 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -4,7 +4,6 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Button from '../components/Button';
 import { UserList } from '../types/api';
-import Return from '../components/Return';
 import { useRouter } from 'expo-router';
 import { StarIcon } from 'react-native-heroicons/solid';
 import Alert from '../components/Alerts';
@@ -58,7 +57,6 @@ const OrderDetailScreen = () => {
           />
         )}
       </View>
-      <Return onClose={() => router.push('/')} />
       <View style={styles.orderHeader}>
         <PoppinsText style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}>
           Detalle del pedido
@@ -165,6 +163,7 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
+    marginTop: 30,
     marginBottom: 15,
   },
   orderImage: {
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 0ae703e..1583caa 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -2,7 +2,6 @@ import React, { useEffect, useState } from 'react';
 import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
-import Return from '../components/Return';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 import Button from '../components/Button';
@@ -64,13 +63,14 @@ const OrdersScreen = () => {
           />
         )}
       </View>
-      <Return onClose={() => router.push('/')} />
       <View style={styles.orderHeader}>
         <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
           Mis Pedidos
         </PoppinsText>
       </View>
-
+      <TouchableOpacity onPress={() => router.push(`order`)}>
+        Ver detalle de orden
+      </TouchableOpacity>
       <View style={styles.orderInfo}>
         {ordersList &&
           ordersList.length > 0 &&
@@ -170,6 +170,7 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
+    marginTop: 30,
     marginBottom: 15,
   },
   orderImage: {
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 488e668..531b251 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -8,7 +8,6 @@ import Button from '../components/Button';
 import { UserService } from '../services/user';
 import { UserList } from '../types/api';
 import { PencilIcon } from 'react-native-heroicons/outline';
-import Return from '../components/Return';
 import { useRouter } from 'expo-router';
 import DatePickerInput from '../components/DatePickerInput';
 import {
@@ -27,21 +26,12 @@ const ProfileScreen = () => {
   const [loading, setLoading] = useState(false);
   const router = useRouter();
 
-  /*   const formatDate = (dateString: string): string => {
-    const date = new Date(dateString);
-    const day = String(date.getDate()).padStart(2, '0');
-    const month = String(date.getMonth() + 1).padStart(2, '0');
-    const year = date.getFullYear();
-    return `${day}/${month}/${year}`;
-  }; */
-
   useEffect(() => {
     const fetchProfile = async () => {
       try {
         const profile = await UserService.getProfile();
 
         if (profile.success) {
-          //profile.data.profile.birthDate = formatDate(profile.data.profile.birthDate);
           setProfile(profile.data);
         }
       } catch (error) {
@@ -130,7 +120,6 @@ const ProfileScreen = () => {
         )}
       </View>
       {/* Header con foto de perfil */}
-      <Return onClose={() => router.push('/')} />
       <View style={styles.profileHeader}>
         {isEditable ? (
           <PoppinsText
@@ -269,6 +258,7 @@ const styles = StyleSheet.create({
   },
   profileHeader: {
     alignItems: 'center',
+    marginTop: 30,
     marginBottom: 15,
   },
   profileImage: {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index f4aeedb..c71813b 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -1,3 +1,5 @@
+import { BaseModel } from '@pharmatech/sdk';
+
 export interface ApiError extends Error {
   response?: {
     data?: {
@@ -123,7 +125,7 @@ type CityResponse = {
   state: StateResponse;
 };
 
-type OrderResponse = {
+type OrderResponse = BaseModel & {
   type: OrderType;
   status: OrderStatus;
   totalPrice: number;

From 8e2d398a61972068dbd8b172c23d00166406ea9f Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 18 Apr 2025 18:43:59 -0400
Subject: [PATCH 112/291] - Implemented PaymentStatusMessage component for
 displaying order status - Added OrderService and PaymentConfirmationService
 for order and payment confirmation handling - Introduced
 PaymentInformationService for fetching payment information - Enhanced
 CheckoutScreen to handle order creation and validation - Updated
 PaymentInfoForm to manage additional fields and validation - Added new types
 for order and payment confirmation in api.d.ts

---
 package-lock.json                             |  9 +-
 package.json                                  |  2 +-
 src/components/LocationSelector.tsx           |  4 +-
 src/components/PaymentInfoForm.tsx            | 58 ++++++++---
 ...usMessage.tsx => PaymentStatusMessage.tsx} |  6 +-
 src/screens/CheckoutScreen.tsx                | 99 +++++++++++++++++--
 src/services/order.ts                         | 42 ++++++++
 src/services/paymentConfirmation.ts           | 71 +++++++++++++
 src/services/paymentInformation.ts            | 35 +++++++
 src/types/api.d.ts                            | 73 ++++++++++++++
 10 files changed, 366 insertions(+), 33 deletions(-)
 rename src/components/{PurchaseStatusMessage.tsx => PaymentStatusMessage.tsx} (91%)
 create mode 100644 src/services/order.ts
 create mode 100644 src/services/paymentConfirmation.ts
 create mode 100644 src/services/paymentInformation.ts

diff --git a/package-lock.json b/package-lock.json
index 8110c6b..ca606cf 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.1",
+        "@pharmatech/sdk": "^0.4.3",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,10 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
-      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
-      "license": "MIT",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
+      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index d8b20f6..b7daf06 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.1",
+    "@pharmatech/sdk": "^0.4.3",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index ee0f736..34ff6fe 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -77,10 +77,12 @@ const LocationSelector = ({
         options={options}
         placeholder="Selecciona una opción"
         onSelect={(val) => {
-          onSelect(val);
           if (selectedOption === 'pickup') {
             const branch = pickupBranches.find((b) => b.name === val);
             setSelectedBranch(branch || null);
+            onSelect(branch ? branch.id : null); // Pass the branch ID (UUID) instead of the name
+          } else {
+            onSelect(val); // For delivery, pass the selected address
           }
         }}
         borderColor={Colors.gray_100}
diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index c331dc6..9492912 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -8,6 +8,10 @@ const PaymentInfoForm = ({
   paymentMethod,
   total,
   onValidationChange,
+  onBankChange,
+  onReferenceChange,
+  onDocumentNumberChange,
+  onPhoneChange,
 }: {
   paymentMethod:
     | 'punto_de_venta'
@@ -17,12 +21,32 @@ const PaymentInfoForm = ({
     | null;
   total: string;
   onValidationChange: (isValid: boolean) => void;
+  onBankChange: (value: string) => void;
+  onReferenceChange: (value: string) => void;
+  onDocumentNumberChange: (value: string) => void;
+  onPhoneChange: (value: string) => void;
 }) => {
   const [bank, setBank] = useState('');
   const [reference, setReference] = useState('');
   const [documentNumber, setDocumentNumber] = useState('');
   const [phone, setPhone] = useState('');
 
+  useEffect(() => {
+    onBankChange(bank);
+  }, [bank]);
+
+  useEffect(() => {
+    onReferenceChange(reference);
+  }, [reference]);
+
+  useEffect(() => {
+    onDocumentNumberChange(documentNumber);
+  }, [documentNumber]);
+
+  useEffect(() => {
+    onPhoneChange(phone);
+  }, [phone]);
+
   useEffect(() => {
     const isValid =
       paymentMethod !== null &&
@@ -51,17 +75,6 @@ const PaymentInfoForm = ({
     backgroundColor: Colors.iconWhite,
   };
 
-  const handleNumericChange = (
-    setter: (val: string) => void,
-    limit?: number,
-  ) => {
-    return (val: string) => {
-      let filtered = val.replace(/\D/g, '');
-      if (limit) filtered = filtered.slice(0, limit);
-      setter(filtered);
-    };
-  };
-
   return (
     <View style={styles.container}>
       {(paymentMethod === 'pago_movil' ||
@@ -116,25 +129,42 @@ const PaymentInfoForm = ({
           <Input
             label="Banco"
             value={bank}
+            placeholder="Ingrese el banco"
             getValue={setBank}
+            errorText="Este campo no puede estar vacío"
+            validation={(val) => val.trim() !== ''}
             {...editableInputProps}
           />
           <Input
             label="Referencia"
             value={reference}
-            getValue={handleNumericChange(setReference)}
+            placeholder="Ingrese la referencia"
+            getValue={(val) => setReference(val.replace(/\D/g, ''))}
+            fieldType="number"
+            errorText="Debe ser un número válido"
+            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
             {...editableInputProps}
           />
           <Input
             label="Número de documento"
+            placeholder="Ingrese el número de documento"
             value={documentNumber}
-            getValue={handleNumericChange(setDocumentNumber, 8)}
+            getValue={(val) =>
+              setDocumentNumber(val.replace(/\D/g, '').slice(0, 8))
+            }
+            fieldType="number"
+            errorText="Debe contener hasta 8 dígitos numéricos"
+            validation={(val) => /^\d{1,8}$/.test(val)}
             {...editableInputProps}
           />
           <Input
             label="Teléfono"
+            placeholder="Ingrese el teléfono"
             value={phone}
-            getValue={handleNumericChange(setPhone, 11)}
+            getValue={(val) => setPhone(val.replace(/\D/g, '').slice(0, 11))}
+            fieldType="number"
+            errorText="Debe tener exactamente 11 dígitos"
+            validation={(val) => /^\d{11}$/.test(val)}
             {...editableInputProps}
           />
         </>
diff --git a/src/components/PurchaseStatusMessage.tsx b/src/components/PaymentStatusMessage.tsx
similarity index 91%
rename from src/components/PurchaseStatusMessage.tsx
rename to src/components/PaymentStatusMessage.tsx
index c60143a..0446869 100644
--- a/src/components/PurchaseStatusMessage.tsx
+++ b/src/components/PaymentStatusMessage.tsx
@@ -3,13 +3,13 @@ import { CheckCircleIcon, XCircleIcon } from 'react-native-heroicons/outline';
 import theme from '../styles/theme';
 import { Text, View, StyleSheet } from 'react-native';
 
-interface PurchaseStatusMessageProps {
+interface PaymentStatusMessageProps {
   status: 'approved' | 'rejected';
   orderNumber: string;
   userName: string;
 }
 
-const PurchaseStatusMessage: React.FC<PurchaseStatusMessageProps> = ({
+const PaymentStatusMessage: React.FC<PaymentStatusMessageProps> = ({
   status,
   orderNumber,
   userName,
@@ -70,4 +70,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default PurchaseStatusMessage;
+export default PaymentStatusMessage;
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 9b74abd..c01b79e 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -17,11 +17,14 @@ import PoppinsText from '../components/PoppinsText';
 import LocationSelector from '../components/LocationSelector';
 import PaymentInfoForm from '../components/PaymentInfoForm';
 import Coupon from '../components/Coupon';
-import PurchaseStatusMessage from '../components/PurchaseStatusMessage';
+import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
+import { OrderService } from '../services/order';
+import { OrderType } from '../types/api.d';
 
 const CheckoutScreen = () => {
   const router = useRouter();
+  const { cartItems } = useCart();
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
   >('pickup');
@@ -30,11 +33,11 @@ const CheckoutScreen = () => {
   >(null);
   const [selectedLocation, setSelectedLocation] = useState<string | null>(null);
   const [currentStep, setCurrentStep] = useState(1);
-  const [status] = useState<'approved' | 'rejected'>('approved');
-  const { cartItems } = useCart();
+  const [status, setStatus] = useState<'approved' | 'rejected'>('approved');
   const [isPaymentInfoValid, setIsPaymentInfoValid] = useState(false);
   const [couponDiscount, setCouponDiscount] = useState(0);
   const [isCouponApplied, setIsCouponApplied] = useState(false);
+  const [errorMessage, setErrorMessage] = useState<string | null>(null);
 
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
@@ -69,15 +72,76 @@ const CheckoutScreen = () => {
     return null;
   };
 
-  const handleContinue = () => {
+  const isValidUUID = (value: string | null): boolean => {
+    const uuidRegex =
+      /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+    return value !== null && uuidRegex.test(value);
+  };
+
+  const handleContinue = async () => {
     if (currentStep < stepsLabels.length) {
+      if (currentStep === stepsLabels.length - 1) {
+        try {
+          if (selectedOption === 'pickup' && !isValidUUID(selectedLocation)) {
+            setErrorMessage('La sucursal seleccionada no es válida.');
+            setStatus('rejected');
+            setCurrentStep(stepsLabels.length);
+            return;
+          }
+
+          if (!selectedOption) {
+            setErrorMessage('Debe seleccionar una opción de compra.');
+            setStatus('rejected');
+            setCurrentStep(stepsLabels.length);
+            return;
+          }
+
+          setErrorMessage(null);
+
+          const orderPayload = {
+            type:
+              selectedOption === 'pickup'
+                ? OrderType.PICKUP
+                : OrderType.DELIVERY,
+            branchId:
+              selectedOption === 'pickup'
+                ? selectedLocation || undefined
+                : undefined,
+            userAddressId:
+              selectedOption === 'delivery'
+                ? selectedLocation || undefined
+                : undefined,
+            products: cartItems.map((item) => ({
+              productPresentationId: item.id,
+              quantity: Math.max(1, item.quantity),
+            })),
+          };
+
+          const orderResponse = await OrderService.create(orderPayload);
+
+          if (!orderResponse.success || !orderResponse.data?.id) {
+            setErrorMessage(
+              'No pudimos procesar tu orden. Inténtalo nuevamente.',
+            );
+            setStatus('rejected');
+            setCurrentStep(stepsLabels.length);
+            return;
+          }
+
+          setStatus('approved');
+          setCurrentStep(stepsLabels.length);
+        } catch {
+          setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
+          setStatus('rejected');
+        }
+      }
       setCurrentStep(currentStep + 1);
     }
   };
 
   const handleGoBack = () => {
     if (currentStep === 1) {
-      router.back(); // Use router.back() for navigation.goBack() in Expo Router
+      router.back();
     } else if (currentStep > 1) {
       setCurrentStep(currentStep - 1);
     }
@@ -171,7 +235,6 @@ const CheckoutScreen = () => {
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
-        {/* Back Button */}
         <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
           <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
         </TouchableOpacity>
@@ -184,6 +247,10 @@ const CheckoutScreen = () => {
           />
         </View>
 
+        {errorMessage && (
+          <PoppinsText style={styles.errorMessage}>{errorMessage}</PoppinsText>
+        )}
+
         {currentStep === 1 && (
           <>
             <PoppinsText style={styles.purchaseOptionsTitle}>
@@ -244,6 +311,14 @@ const CheckoutScreen = () => {
                 paymentMethod={selectedPayment}
                 total={total.toFixed(2)}
                 onValidationChange={setIsPaymentInfoValid}
+                onBankChange={(value) => console.log('Bank changed:', value)}
+                onReferenceChange={(value) =>
+                  console.log('Reference changed:', value)
+                }
+                onDocumentNumberChange={(value) =>
+                  console.log('Document number changed:', value)
+                }
+                onPhoneChange={(value) => console.log('Phone changed:', value)}
               />
             </View>
           </>
@@ -254,10 +329,10 @@ const CheckoutScreen = () => {
             <PoppinsText style={styles.purchaseOptionsTitle}>
               Confirmación de Orden
             </PoppinsText>
-            <PurchaseStatusMessage
+            <PaymentStatusMessage
               status={status}
-              orderNumber="12345"
-              userName="Cliente1"
+              orderNumber={'N/A'}
+              userName={'Usuario'}
             />
             <View style={styles.confirmationContainer}>
               {renderConfirmationContent(status)}
@@ -460,6 +535,12 @@ const styles = StyleSheet.create({
     marginTop: 10,
     width: '100%',
   },
+  errorMessage: {
+    color: Colors.semanticDanger,
+    fontSize: FontSizes.b2.size,
+    marginBottom: 10,
+    textAlign: 'center',
+  },
 });
 
 export default CheckoutScreen;
diff --git a/src/services/order.ts b/src/services/order.ts
new file mode 100644
index 0000000..c5a49b5
--- /dev/null
+++ b/src/services/order.ts
@@ -0,0 +1,42 @@
+import { api } from '../lib/sdkConfig';
+import * as SecureStore from 'expo-secure-store';
+import { ServiceResponse, CreateOrder, OrderResponse } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const OrderService = {
+  create: async (
+    order: CreateOrder,
+  ): Promise<ServiceResponse<OrderResponse>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        console.warn('Auth token not found in SecureStore');
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      console.log('Sending order creation request:', order);
+      const response = await api.order.create(order, token);
+
+      if (!response?.id) {
+        // Use the corrected property name
+        console.error('Order creation response missing id:', response);
+        return {
+          success: false,
+          error: 'La respuesta no contiene un ID de orden válido',
+        };
+      }
+
+      console.log('Order creation response:', response);
+      return { success: true, data: response };
+    } catch (error) {
+      console.error('Error in OrderService.create:', error);
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/services/paymentConfirmation.ts b/src/services/paymentConfirmation.ts
new file mode 100644
index 0000000..06c7491
--- /dev/null
+++ b/src/services/paymentConfirmation.ts
@@ -0,0 +1,71 @@
+import { api } from '../lib/sdkConfig';
+import * as SecureStore from 'expo-secure-store';
+import {
+  ServiceResponse,
+  PaymentConfirmation,
+  PaymentConfirmationResponse,
+} from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const PaymentConfirmationService = {
+  create: async (
+    paymentConfirmation: PaymentConfirmation,
+  ): Promise<ServiceResponse<PaymentConfirmationResponse>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        console.warn('Auth token not found in SecureStore');
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      console.log('Sending payment confirmation request:', paymentConfirmation);
+
+      // Validate paymentConfirmation
+      if (
+        !paymentConfirmation.documentId ||
+        !paymentConfirmation.phoneNumber ||
+        !paymentConfirmation.bank ||
+        !paymentConfirmation.reference
+      ) {
+        console.error(
+          'Invalid payment confirmation payload:',
+          paymentConfirmation,
+        );
+        return {
+          success: false,
+          error: 'Datos de confirmación de pago inválidos',
+        };
+      }
+
+      const response = await api.paymentConfirmation.create(
+        paymentConfirmation,
+        token,
+      );
+
+      // Adjust validation based on actual response structure
+      if (!response || !response.id) {
+        console.error(
+          'Payment confirmation failed: Missing ID in response',
+          response,
+        );
+        return {
+          success: false,
+          error:
+            'Error en la confirmación del pago: Falta el ID en la respuesta',
+        };
+      }
+
+      console.log('Payment confirmation response:', response);
+      return { success: true, data: response };
+    } catch (error) {
+      console.error('Error in PaymentConfirmationService.create:', error);
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
new file mode 100644
index 0000000..32b9977
--- /dev/null
+++ b/src/services/paymentInformation.ts
@@ -0,0 +1,35 @@
+import { api } from '../lib/sdkConfig';
+import * as SecureStore from 'expo-secure-store';
+import {
+  ServiceResponse,
+  PaymentInformation,
+  PaymentMethod,
+} from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const PaymentInformationService = {
+  findAll: async (
+    paymentMethod?: PaymentMethod,
+  ): Promise<ServiceResponse<PaymentInformation[]>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        return {
+          success: false,
+          error: 'Token de autenticación no encontrado',
+        };
+      }
+
+      const response = await api.paymentInformation.findAll({
+        paymentMethod,
+      });
+
+      return { success: true, data: response.results };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index b0ee344..71168a4 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -112,3 +112,76 @@ export type Coupon = {
 };
 
 export type CouponResponse = Coupon & BaseModel;
+
+export enum OrderType {
+  PICKUP = 'pickup',
+  DELIVERY = 'delivery',
+}
+
+export enum OrderStatus {
+  REQUESTED = 'requested',
+  APPROVED = 'approved',
+  READY = 'ready',
+  COMPLETED = 'completed',
+  CANCELED = 'canceled',
+}
+
+export interface CreateOrderDetail {
+  productPresentationId: string;
+  quantity: number;
+}
+
+export interface CreateOrder {
+  type: OrderType;
+  branchId?: string;
+  products: {
+    productPresentationId: string;
+    quantity: number;
+  }[];
+}
+
+export interface OrderResponse extends BaseModel {
+  id: string;
+  type: OrderType;
+  status: OrderStatus;
+  totalPrice: number;
+}
+
+export enum PaymentMethod {
+  CARD = 'card',
+  MOBILE_PAYMENT = 'mobile_payment',
+  BANK_TRANSFER = 'bank_transfer',
+  CASH = 'cash',
+}
+
+export interface PaymentConfirmation {
+  bank: string;
+  reference: string;
+  documentId: string;
+  phoneNumber: string;
+}
+
+export interface PaymentConfirmationResponse extends BaseModel {
+  bank: string;
+  reference: string;
+  documentId: string;
+  phoneNumber: string;
+}
+
+export interface PaymentInformation {
+  bank: string;
+  accountType: string;
+  account: string;
+  documentId: string;
+  phoneNumber: string;
+  paymentMethod: PaymentMethod;
+}
+
+export interface PaymentInfoResponse extends BaseModel {
+  bank: string;
+  accountType: string;
+  account: string;
+  documentId: string;
+  phoneNumber: string;
+  paymentMethod: PaymentMethod;
+}

From c4c5661eda2e3c84d4417fa9a164a2129cd024e3 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 00:31:50 -0400
Subject: [PATCH 113/291] Created option for upload profile image

---
 app.json                      | 12 +++++-
 package-lock.json             | 20 +++++++++
 package.json                  |  3 +-
 src/screens/ProfileScreen.tsx | 77 +++++++++++++++++++++++++++++------
 4 files changed, 98 insertions(+), 14 deletions(-)

diff --git a/app.json b/app.json
index aeee46e..b2a62fa 100644
--- a/app.json
+++ b/app.json
@@ -47,6 +47,16 @@
     "updates": {
       "url": "https://u.expo.dev/3b8bad5d-7426-4881-aebd-cfb1ccf0795d"
     },
-    "plugins": ["expo-font", "expo-router", "expo-secure-store"]
+    "plugins": [
+      "expo-font",
+      "expo-router",
+      "expo-secure-store",
+      [
+        "expo-image-picker",
+        {
+          "photosPermission": "Allow $(PRODUCT_NAME) to access your camera."
+        }
+      ]
+    ]
   }
 }
diff --git a/package-lock.json b/package-lock.json
index ca606cf..67ff89a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -15,6 +15,7 @@
         "expo": "~52.0.37",
         "expo-constants": "~17.0.7",
         "expo-font": "~13.0.4",
+        "expo-image-picker": "~16.0.6",
         "expo-linking": "~7.0.5",
         "expo-modules-core": "^2.2.2",
         "expo-router": "~4.0.17",
@@ -8240,6 +8241,25 @@
         "react": "*"
       }
     },
+    "node_modules/expo-image-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-5.0.0.tgz",
+      "integrity": "sha512-Eg+5FHtyzv3Jjw9dHwu2pWy4xjf8fu3V0Asyy42kO+t/FbvW/vjUixpTjPtgKQLQh+2/9Nk4JjFDV6FwCnF2ZA==",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-image-picker": {
+      "version": "16.0.6",
+      "resolved": "https://registry.npmjs.org/expo-image-picker/-/expo-image-picker-16.0.6.tgz",
+      "integrity": "sha512-HN4xZirFjsFDIsWFb12AZh19fRzuvZjj2ll17cGr19VNRP06S/VPQU3Tdccn5vwUzQhOBlLu704CnNm278boiQ==",
+      "dependencies": {
+        "expo-image-loader": "~5.0.0"
+      },
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-json-utils": {
       "version": "0.14.0",
       "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
diff --git a/package.json b/package.json
index b7daf06..13738c3 100644
--- a/package.json
+++ b/package.json
@@ -46,7 +46,8 @@
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "tailwindcss": "^3.4.17",
-    "react-native-maps": "1.18.0"
+    "react-native-maps": "1.18.0",
+    "expo-image-picker": "~16.0.6"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 531b251..5980d0b 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -1,15 +1,22 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  TouchableOpacity,
+  ScrollView,
+  Image,
+} from 'react-native';
 import Avatar from '../components/Avatar';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Input from '../components/Input';
 import Button from '../components/Button';
 import { UserService } from '../services/user';
-import { UserList } from '../types/api';
-import { PencilIcon } from 'react-native-heroicons/outline';
+import { UserList } from '@pharmatech/sdk';
+import { PencilIcon, TrashIcon } from 'react-native-heroicons/outline';
 import { useRouter } from 'expo-router';
 import DatePickerInput from '../components/DatePickerInput';
+import * as ImagePicker from 'expo-image-picker';
 import {
   validateDateFormat,
   validatePhoneNumberLength,
@@ -17,8 +24,17 @@ import {
 } from '../utils/validators';
 import Alert from '../components/Alerts';
 
+const formatDate = (dateString: Date): string => {
+  const date = new Date(dateString);
+  const day = String(date.getDate()).padStart(2, '0');
+  const month = String(date.getMonth() + 1).padStart(2, '0');
+  const year = date.getFullYear();
+  return `${year}-${month}-${day}`;
+};
+
 const ProfileScreen = () => {
-  const [profile, setProfile] = useState<UserList>({});
+  const [profile, setProfile] = useState<UserList>({} as UserList);
+  const [image, setImage] = useState<string | null>(null);
   const [isEditable, setIsEditable] = useState(false);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
@@ -48,14 +64,14 @@ const ProfileScreen = () => {
         profile.firstName,
         profile.lastName,
         profile.phoneNumber,
-        profile.profile?.birthDate,
+        formatDate(profile.profile?.birthDate),
       ])
     ) {
       setShowErrorAlert(true);
       setErrorMessage('Por favor completa todos los campos');
       return;
     }
-    if (!validateDateFormat(profile.profile?.birthDate)) {
+    if (!validateDateFormat(formatDate(profile.profile?.birthDate))) {
       setShowErrorAlert(true);
       setErrorMessage('Formato de fecha inválido (Use YYYY-MM-DD)');
       return;
@@ -74,9 +90,8 @@ const ProfileScreen = () => {
       const updatedProfile = {
         firstName: profile.firstName,
         lastName: profile.lastName,
-        birthDate: profile.profile?.birthDate,
+        birthDate: profile.profile?.birthDate.toString(),
         phoneNumber: profile.phoneNumber,
-        email: profile.email,
       };
 
       const response = await UserService.updateProfile(updatedProfile);
@@ -94,6 +109,21 @@ const ProfileScreen = () => {
     }
   };
 
+  const handleImageUpload = async () => {
+    const result = await ImagePicker.launchImageLibraryAsync({
+      mediaTypes: ['images'],
+      allowsEditing: true,
+      aspect: [4, 3],
+      quality: 1,
+    });
+
+    console.log(result);
+
+    if (!result.canceled) {
+      setImage(result.assets[0].uri);
+    }
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -135,7 +165,29 @@ const ProfileScreen = () => {
           </PoppinsText>
         )}
 
-        <Avatar scale={80} />
+        {isEditable ? (
+          <View>
+            <TouchableOpacity
+              style={{
+                width: 80,
+                height: 80,
+                borderRadius: 100,
+                backgroundColor: 'rgba(52, 52, 52, 0.5)',
+                padding: 30,
+                position: 'absolute',
+                zIndex: 999,
+              }}
+            >
+              <TrashIcon color={Colors.iconWhite} size={20} />
+            </TouchableOpacity>
+            <Image
+              source={{ uri: image ? image : profile.profile.profilePicture }}
+              style={{ width: 80, height: 80, borderRadius: 100 }}
+            />
+          </View>
+        ) : (
+          <Avatar scale={80} />
+        )}
         {isEditable ? (
           <TouchableOpacity
             style={{
@@ -149,6 +201,7 @@ const ProfileScreen = () => {
               justifyContent: 'center',
               paddingStart: 5,
             }}
+            onPress={handleImageUpload}
           >
             <PencilIcon color={Colors.iconWhite} size={20} />
           </TouchableOpacity>
@@ -198,18 +251,18 @@ const ProfileScreen = () => {
           <DatePickerInput
             label="Fecha de Nacimiento"
             placeholder="Selecciona tu fecha"
-            value={profile?.profile?.birthDate}
+            value={profile?.profile?.birthDate.toString()}
             getValue={(value) =>
               setProfile({
                 ...profile,
-                profile: { ...profile.profile, birthDate: value },
+                profile: { ...profile.profile, birthDate: new Date(value) },
               })
             }
           />
         ) : (
           <Input
             label="Fecha de nacimiento"
-            value={profile?.profile?.birthDate}
+            value={formatDate(profile?.profile?.birthDate)}
             isEditable={isEditable}
             border={isEditable ? 'default' : 'none'}
           />

From 1b5efbf3e2046c7ae0a8061dfb0cfb5067ab6932 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 00:58:16 -0400
Subject: [PATCH 114/291] Using menu as screen

---
 src/app/_layout.tsx               |   5 +
 src/app/menu.tsx                  |   2 +
 src/components/AvatarWithMenu.tsx |  46 +------
 src/screens/MenuScreen.tsx        | 214 ++++++++++++++++++++++++++++++
 4 files changed, 223 insertions(+), 44 deletions(-)
 create mode 100644 src/app/menu.tsx
 create mode 100644 src/screens/MenuScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index f91edca..ee0210a 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -64,6 +64,7 @@ export default function RootLayout() {
       >
         {/* Cambia la pantalla inicial al SplashScreen personalizado */}
         <Stack.Screen name="index" options={{ headerShown: false }} />
+
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
@@ -72,6 +73,10 @@ export default function RootLayout() {
           name="profile"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="menu"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
         <Stack.Screen
           name="direction"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/menu.tsx b/src/app/menu.tsx
new file mode 100644
index 0000000..fb8d623
--- /dev/null
+++ b/src/app/menu.tsx
@@ -0,0 +1,2 @@
+import MenuScreen from '../screens/MenuScreen';
+export default MenuScreen;
diff --git a/src/components/AvatarWithMenu.tsx b/src/components/AvatarWithMenu.tsx
index 92624ab..3432caa 100644
--- a/src/components/AvatarWithMenu.tsx
+++ b/src/components/AvatarWithMenu.tsx
@@ -1,56 +1,14 @@
-import React, { useState } from 'react';
+import React from 'react';
 import { View, TouchableOpacity, StyleSheet } from 'react-native';
-import SlideMenu from './SlideMenu';
 import Avatar from './Avatar';
-import {
-  UserIcon,
-  MapIcon,
-  ShieldCheckIcon,
-  ShoppingCartIcon,
-} from 'react-native-heroicons/outline';
-import { Colors } from '../styles/theme';
 import { useRouter } from 'expo-router';
 
 const AvatarWithMenu: React.FC = () => {
-  const [isMenuOpen, setIsMenuOpen] = useState(false);
   const router = useRouter();
 
-  const menuItems = [
-    {
-      id: '1',
-      title: 'Perfil',
-      icon: <UserIcon color={Colors.iconMainPrimary} />,
-      onPress: () => router.push('/profile'),
-    },
-    {
-      id: '2',
-      title: 'Mis Direcciones',
-      icon: <MapIcon color={Colors.iconMainPrimary} />,
-      onPress: () => router.push('/direction'),
-    },
-    {
-      id: '3',
-      title: 'Seguridad',
-      icon: <ShieldCheckIcon color={Colors.iconMainPrimary} />,
-      onPress: () => router.push('/change-password'),
-    },
-    {
-      id: '4',
-      title: 'Mis Pedidos',
-      icon: <ShoppingCartIcon color={Colors.iconMainPrimary} />,
-      onPress: () => router.push('/orders'),
-    },
-  ];
-
   return (
     <View style={styles.container}>
-      <SlideMenu
-        isOpen={isMenuOpen}
-        onClose={() => setIsMenuOpen(false)}
-        items={menuItems}
-      />
-
-      <TouchableOpacity onPress={() => setIsMenuOpen(!isMenuOpen)}>
+      <TouchableOpacity onPress={() => router.push('menu')}>
         <Avatar />
       </TouchableOpacity>
     </View>
diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
new file mode 100644
index 0000000..62686e5
--- /dev/null
+++ b/src/screens/MenuScreen.tsx
@@ -0,0 +1,214 @@
+import { useEffect, useState } from 'react';
+import { StyleSheet, TouchableOpacity, View, SafeAreaView } from 'react-native';
+import { Colors } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Avatar from '../components/Avatar';
+import { UserService } from '../services/user';
+import {
+  ArrowUpTrayIcon,
+  MapIcon,
+  ShieldCheckIcon,
+  ShoppingCartIcon,
+  UserIcon,
+} from 'react-native-heroicons/outline';
+import { AuthService } from '../services/auth';
+import { useRouter } from 'expo-router';
+import Popup from '../components/Popup';
+
+export default function MenuScreen() {
+  const [userName, setUserName] = useState('');
+  const [isActive, setIsActive] = useState('');
+  const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
+    useState(false);
+  const router = useRouter();
+
+  const items = [
+    {
+      id: '1',
+      title: 'Perfil',
+      icon: <UserIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/profile'),
+    },
+    {
+      id: '2',
+      title: 'Mis Direcciones',
+      icon: <MapIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/direction'),
+    },
+    {
+      id: '3',
+      title: 'Seguridad',
+      icon: <ShieldCheckIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/change-password'),
+    },
+    {
+      id: '4',
+      title: 'Mis Pedidos',
+      icon: <ShoppingCartIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/orders'),
+    },
+  ];
+
+  const handleLogout = async () => {
+    try {
+      await AuthService.logout();
+      setIsLogoutConfirmationVisible(false);
+      router.replace('/login');
+    } catch (error) {
+      console.error('Error al cerrar sesión:', error);
+    }
+  };
+
+  useEffect(() => {
+    const fetchProfile = async () => {
+      try {
+        const profile = await UserService.getProfile();
+
+        if (profile.success)
+          setUserName(profile.data.firstName + ' ' + profile.data.lastName);
+      } catch (error) {
+        console.log(error);
+      }
+    };
+    fetchProfile();
+    setIsActive('');
+  }, []);
+
+  return (
+    <>
+      <View style={[styles.menu]}>
+        <SafeAreaView style={styles.safeArea}>
+          <View style={styles.menuContent}>
+            <View>
+              <View style={{ padding: 20, flexDirection: 'row' }}>
+                <Avatar scale={40} />
+                <View>
+                  <PoppinsText
+                    weight="semibold"
+                    style={{ marginHorizontal: 10 }}
+                  >
+                    {userName}
+                  </PoppinsText>
+                  <PoppinsText
+                    style={{ marginHorizontal: 10, color: Colors.gray_500 }}
+                  >
+                    Cuenta Personal
+                  </PoppinsText>
+                </View>
+              </View>
+              <View style={{ paddingHorizontal: 5 }}>
+                {items.map((item) => (
+                  <TouchableOpacity
+                    key={item.id}
+                    style={[
+                      styles.menuItem,
+                      isActive == item.id && { borderStartWidth: 5 },
+                    ]}
+                    onPress={() => {
+                      item.onPress();
+                    }}
+                  >
+                    {item.icon && (
+                      <View style={styles.menuIcon}>{item.icon}</View>
+                    )}
+                    <PoppinsText style={styles.menuText}>
+                      {item.title}
+                    </PoppinsText>
+                  </TouchableOpacity>
+                ))}
+              </View>
+            </View>
+            <View
+              style={{
+                borderTopColor: Colors.gray_500,
+                borderTopWidth: 1,
+                marginVertical: 10,
+              }}
+            >
+              <TouchableOpacity
+                style={{
+                  flexDirection: 'row',
+                  padding: 15,
+                  alignContent: 'center',
+                }}
+                onPress={() => setIsLogoutConfirmationVisible(true)}
+              >
+                <View>
+                  <ArrowUpTrayIcon
+                    rotation={90}
+                    color={Colors.semanticDanger}
+                    size={20}
+                  />
+                </View>
+                <PoppinsText
+                  style={{ color: Colors.semanticDanger, marginHorizontal: 10 }}
+                >
+                  Cerrar Sesión
+                </PoppinsText>
+              </TouchableOpacity>
+            </View>
+          </View>
+        </SafeAreaView>
+      </View>
+
+      {/* Popup for Logout Confirmation */}
+      <Popup
+        visible={isLogoutConfirmationVisible}
+        type="center"
+        headerText="Cerrar sesión"
+        bodyText="¿Estás seguro de que deseas cerrar sesión?"
+        primaryButton={{
+          text: 'Sí',
+          onPress: handleLogout,
+        }}
+        secondaryButton={{
+          text: 'No',
+          onPress: () => setIsLogoutConfirmationVisible(false),
+        }}
+        onClose={() => setIsLogoutConfirmationVisible(false)}
+      />
+    </>
+  );
+}
+
+const styles = StyleSheet.create({
+  menu: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    zIndex: 100,
+    elevation: 10,
+  },
+  safeArea: {
+    flex: 1,
+  },
+  menuContent: {
+    flex: 1,
+    marginTop: 40,
+    paddingHorizontal: 10,
+    justifyContent: 'space-between',
+  },
+  menuItem: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginVertical: 8,
+    paddingVertical: 3,
+    paddingHorizontal: 20,
+    borderColor: Colors.primary,
+    borderRadius: 5,
+  },
+  menuIcon: {
+    marginRight: 20,
+    fontSize: 24,
+    width: 30,
+    textAlign: 'center',
+  },
+  menuText: {
+    fontSize: 18,
+    color: '#333',
+  },
+  overlay: {
+    ...StyleSheet.absoluteFillObject,
+    backgroundColor: 'rgba(0,0,0,0.5)',
+    zIndex: 99,
+  },
+});

From f7026582a0648f4f72c154a77c658b14aa15f5dc Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 19 Apr 2025 01:03:16 -0400
Subject: [PATCH 115/291] Creation of new user address and eliminating address

---
 app.json                              |   1 +
 package-lock.json                     |  10 ++
 package.json                          |   5 +-
 src/app/_layout.tsx                   |   8 +
 src/app/createDirection.tsx           |   2 +
 src/app/selectLocation.tsx            |   2 +
 src/screens/DirectionCreateScreen.tsx | 235 ++++++++++++++++++++++++++
 src/screens/DirectionScreen.tsx       | 167 +++++++++++-------
 src/screens/SelectLocationScreen.tsx  | 230 +++++++++++++++++++++++++
 src/services/user.ts                  |  39 ++++-
 10 files changed, 628 insertions(+), 71 deletions(-)
 create mode 100644 src/app/createDirection.tsx
 create mode 100644 src/app/selectLocation.tsx
 create mode 100644 src/screens/DirectionCreateScreen.tsx
 create mode 100644 src/screens/SelectLocationScreen.tsx

diff --git a/app.json b/app.json
index aeee46e..73a31dc 100644
--- a/app.json
+++ b/app.json
@@ -17,6 +17,7 @@
       "supportsTablet": true
     },
     "android": {
+      "permissions": ["ACCESS_FINE_LOCATION", "ACCESS_COARSE_LOCATION"],
       "adaptiveIcon": {
         "foregroundImage": "./src/assets/images/PharmaTech-icon.png",
         "backgroundColor": "#1C2143"
diff --git a/package-lock.json b/package-lock.json
index ca606cf..b500d9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -16,6 +16,7 @@
         "expo-constants": "~17.0.7",
         "expo-font": "~13.0.4",
         "expo-linking": "~7.0.5",
+        "expo-location": "^18.0.10",
         "expo-modules-core": "^2.2.2",
         "expo-router": "~4.0.17",
         "expo-secure-store": "~14.0.1",
@@ -8269,6 +8270,15 @@
         "react-native": "*"
       }
     },
+    "node_modules/expo-location": {
+      "version": "18.0.10",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
+      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
     "node_modules/expo-manifests": {
       "version": "0.15.7",
       "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.15.7.tgz",
diff --git a/package.json b/package.json
index b7daf06..def02ad 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "expo-constants": "~17.0.7",
     "expo-font": "~13.0.4",
     "expo-linking": "~7.0.5",
+    "expo-location": "^18.0.10",
     "expo-modules-core": "^2.2.2",
     "expo-router": "~4.0.17",
     "expo-secure-store": "~14.0.1",
@@ -39,14 +40,14 @@
     "react-native": "0.76.7",
     "react-native-calendars": "^1.1310.0",
     "react-native-heroicons": "^4.0.0",
+    "react-native-maps": "1.18.0",
     "react-native-pager-view": "^6.7.0",
     "react-native-reanimated": "^3.16.2",
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17",
-    "react-native-maps": "1.18.0"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index f91edca..13aa1a6 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -76,6 +76,14 @@ export default function RootLayout() {
           name="direction"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="selectLocation"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
+        <Stack.Screen
+          name="createDirection"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
         <Stack.Screen
           name="orders"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/createDirection.tsx b/src/app/createDirection.tsx
new file mode 100644
index 0000000..1ae1ce1
--- /dev/null
+++ b/src/app/createDirection.tsx
@@ -0,0 +1,2 @@
+import DirectionCreateScreen from '../screens/DirectionCreateScreen';
+export default DirectionCreateScreen;
diff --git a/src/app/selectLocation.tsx b/src/app/selectLocation.tsx
new file mode 100644
index 0000000..4dfa35d
--- /dev/null
+++ b/src/app/selectLocation.tsx
@@ -0,0 +1,2 @@
+import SelectLocationScreen from '../screens/SelectLocationScreen';
+export default SelectLocationScreen;
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
new file mode 100644
index 0000000..bb414ca
--- /dev/null
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -0,0 +1,235 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Input from '../components/Input';
+import Button from '../components/Button';
+import { UserService } from '../services/user';
+import { CreateUserAddressRequest } from '@pharmatech/sdk';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { validateRequiredFields } from '../utils/validators';
+import Alert from '../components/Alerts';
+import { StateService } from '../services/state';
+import { State, CityResponse } from '../types/api';
+import Dropdown from '../components/Dropdown';
+
+const DirectionCreateScreen = () => {
+  const { latitude, longitude } = useLocalSearchParams();
+
+  console.log('Parámetros recibidos en DirectionCreateScreen:', {
+    latitude,
+    longitude,
+  });
+
+  const [address, setAddress] = useState<CreateUserAddressRequest>({
+    adress: '',
+    zipCode: '',
+    additionalInformation: '',
+    referencePoint: '',
+    latitude: latitude ? parseFloat(latitude as string) : null,
+    longitude: longitude ? parseFloat(longitude as string) : null,
+    cityId: '',
+  });
+
+  console.log('Estado inicial de address:', address);
+
+  const [states, setStates] = useState<State[]>([]);
+  const [cities, setCities] = useState<CityResponse[]>([]);
+  const [selectedState, setSelectedState] = useState('');
+  const [selectedCity, setSelectedCity] = useState('');
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [loading, setLoading] = useState(false);
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchStates = async () => {
+      const states = await StateService.getStates(1, 40);
+      if (states.success) {
+        setStates(states.data.results);
+      }
+    };
+    fetchStates();
+  }, []);
+
+  useEffect(() => {
+    const fetchCities = async () => {
+      const cities = await StateService.getCities(1, 40, selectedState);
+      if (cities.success) {
+        setCities(cities.data.results);
+      }
+    };
+    fetchCities();
+  }, [selectedState]);
+
+  const submitAddress = async () => {
+    if (!validateRequiredFields([address.adress, address.zipCode])) {
+      setShowErrorAlert(true);
+      setErrorMessage('Por favor completa todos los campos obligatorios');
+      return;
+    }
+
+    if (!address.latitude || !address.longitude) {
+      console.log('Coordenadas faltantes:', {
+        latitude: address.latitude,
+        longitude: address.longitude,
+      });
+      setShowErrorAlert(true);
+      setErrorMessage('Las coordenadas de la dirección son obligatorias');
+      return;
+    }
+
+    setLoading(true);
+    try {
+      const newAddress: CreateUserAddressRequest = {
+        adress: address.adress,
+        zipCode: address.zipCode,
+        latitude: address.latitude,
+        longitude: address.longitude,
+        cityId: selectedCity,
+        additionalInformation: address.additionalInformation || null,
+        referencePoint: address.referencePoint || null,
+      };
+
+      console.log('Datos enviados a la API:', newAddress);
+
+      const response = await UserService.saveDirection(newAddress);
+
+      if (response.success) {
+        setShowSuccessAlert(true);
+        setTimeout(() => {
+          router.replace('/direction'); // Redirige al listado de direcciones después de 2 segundos
+        }, 2000);
+      } else {
+        setShowErrorAlert(true);
+        setErrorMessage('Error al guardar la dirección');
+      }
+    } catch (error) {
+      console.error('Error al guardar la dirección:', error);
+      setShowErrorAlert(true);
+      setErrorMessage('Ocurrió un error al intentar guardar la dirección');
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Dirección creada correctamente"
+            onClose={() => setShowSuccessAlert(false)}
+            borderColor
+          />
+        )}
+      </View>
+      <View style={styles.addressHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size, marginBottom: 10 }}>
+          Agregar Dirección
+        </PoppinsText>
+      </View>
+
+      {/* Información de direccion */}
+      <View style={styles.addressInfo}>
+        <Dropdown
+          label="Estado"
+          placeholder="Seleccione Estado"
+          options={states.map((state) => state.name)}
+          borderColor={Colors.gray_100}
+          onSelect={(option) => {
+            const sState = states.find((state) => state.name === option);
+            if (sState) setSelectedState(sState.id);
+          }}
+        />
+        <Dropdown
+          label="Ciudad"
+          placeholder="Seleccione Ciudad"
+          options={cities.map((city) => city.name)}
+          borderColor={Colors.gray_100}
+          onSelect={(option) => {
+            const sCity = cities.find((city) => city.name === option);
+            if (sCity) setSelectedCity(sCity.id);
+          }}
+        />
+        <Input
+          label="Dirección: (Ubicación actual)"
+          value={address?.adress}
+          getValue={(value) => setAddress({ ...address, adress: value })}
+          errorText="El campo no puede estar vacío"
+          backgroundColor={Colors.textWhite}
+        />
+        <Input
+          label="Código Postal:"
+          value={address?.zipCode}
+          getValue={(value) => setAddress({ ...address, zipCode: value })}
+          fieldType="number"
+          errorText="El campo no puede estar vacío"
+          backgroundColor={Colors.textWhite}
+        />
+        <Input
+          label="Información adicional:"
+          value={address?.additionalInformation ?? undefined}
+          getValue={(value) =>
+            setAddress({ ...address, additionalInformation: value })
+          }
+          backgroundColor={Colors.textWhite}
+        />
+        <Input
+          label="Punto de referencia:"
+          value={address?.referencePoint ?? undefined}
+          getValue={(value) =>
+            setAddress({ ...address, referencePoint: value })
+          }
+          backgroundColor={Colors.textWhite}
+        />
+      </View>
+
+      {/* Botón de guardar */}
+      <Button
+        title="Guardar Dirección"
+        onPress={() => submitAddress()}
+        loading={loading}
+      />
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -163,
+    top: 20,
+    zIndex: 1000,
+    transform: [{ translateX: 20 }],
+  },
+  addressHeader: {
+    alignItems: 'center',
+    marginTop: 30,
+    marginBottom: 15,
+  },
+  addressInfo: {
+    marginBottom: 20,
+  },
+});
+
+export default DirectionCreateScreen;
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index bd62c56..2302903 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -5,7 +5,7 @@ import PoppinsText from '../components/PoppinsText';
 import Input from '../components/Input';
 import Button from '../components/Button';
 import { UserService } from '../services/user';
-import { UserAddressResponse } from '../types/api';
+import { UserAddressResponse } from '@pharmatech/sdk';
 import {
   MagnifyingGlassIcon,
   PencilIcon,
@@ -13,6 +13,7 @@ import {
 } from 'react-native-heroicons/outline';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
+import Popup from '../components/Popup'; // Importamos el componente Popup
 
 const DirectionScreen = () => {
   const [searchDirection, setSearchDirection] = useState('');
@@ -22,6 +23,10 @@ const DirectionScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showInfoAlert, setShowInfoAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const [selectedDirectionId, setSelectedDirectionId] = useState<string | null>(
+    null,
+  ); // Dirección seleccionada para eliminar
+  const [showDeletePopup, setShowDeletePopup] = useState(false); // Controla la visibilidad del popup
   const router = useRouter();
 
   useEffect(() => {
@@ -46,6 +51,23 @@ const DirectionScreen = () => {
     fetchDirection();
   }, []);
 
+  const handleDeleteDirection = async () => {
+    if (!selectedDirectionId) return;
+
+    try {
+      // Llamada al endpoint para eliminar la dirección
+      await UserService.deleteAddress(selectedDirectionId);
+      setDirectionList((prev) =>
+        prev?.filter((direction) => direction.id !== selectedDirectionId),
+      );
+      setShowDeletePopup(false); // Cierra el popup
+    } catch (error) {
+      console.error('Error al eliminar la dirección:', error);
+      setErrorMessage('No se pudo eliminar la dirección');
+      setShowErrorAlert(true);
+    }
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -91,32 +113,36 @@ const DirectionScreen = () => {
         {directionsList &&
           directionsList.length > 0 &&
           directionsList.map((direction, index) => (
-            <View
-              key={index}
-              style={{
-                flexDirection: 'row',
-                padding: 10,
-                borderBottomWidth: 1,
-                borderColor: Colors.gray_100,
-              }}
-            >
-              <View style={{ paddingVertical: 10 }}>
-                <PoppinsText>{direction.adress}, </PoppinsText>
-                <PoppinsText>
+            <View key={index} style={styles.cardContainer}>
+              {/* Contenedor del texto */}
+              <View style={styles.textContainer}>
+                <PoppinsText style={styles.addressText} weight="regular">
+                  {direction.adress}
+                </PoppinsText>
+                <PoppinsText style={styles.cityText} weight="regular">
                   {direction.nameCity}, {direction.nameState},{' '}
                   {direction.zipCode}
                 </PoppinsText>
-                <PoppinsText>{direction.additionalInformation}</PoppinsText>
-                <PoppinsText>{direction.referencePoint}</PoppinsText>
+                {direction.additionalInformation && (
+                  <PoppinsText
+                    style={styles.additionalInfoText}
+                    weight="regular"
+                  >
+                    {direction.additionalInformation}
+                  </PoppinsText>
+                )}
+                {direction.referencePoint && (
+                  <PoppinsText
+                    style={styles.referencePointText}
+                    weight="regular"
+                  >
+                    {direction.referencePoint}
+                  </PoppinsText>
+                )}
               </View>
-              <View
-                style={{
-                  flex: 1,
-                  flexDirection: 'row',
-                  justifyContent: 'space-evenly',
-                  alignItems: 'center',
-                }}
-              >
+
+              {/* Contenedor de los íconos */}
+              <View style={styles.iconContainer}>
                 <TouchableOpacity
                   onPress={() =>
                     router.push(`change-direction/${direction.id}`)
@@ -125,9 +151,10 @@ const DirectionScreen = () => {
                   <PencilIcon color={Colors.iconMainPrimary} size={20} />
                 </TouchableOpacity>
                 <TouchableOpacity
-                  onPress={() =>
-                    console.log(`Delete direction with id: ${direction.id}`)
-                  }
+                  onPress={() => {
+                    setSelectedDirectionId(direction.id); // Establece la dirección seleccionada
+                    setShowDeletePopup(true); // Muestra el popup
+                  }}
                 >
                   <TrashIcon color={Colors.iconMainPrimary} size={20} />
                 </TouchableOpacity>
@@ -138,7 +165,23 @@ const DirectionScreen = () => {
 
       <Button
         title="Agregar nueva dirección"
-        onPress={() => router.push('/change-direction')}
+        onPress={() => router.push('/selectLocation')}
+      />
+
+      {/* Popup de confirmación */}
+      <Popup
+        visible={showDeletePopup}
+        headerText="Eliminar Dirección"
+        bodyText="¿Está seguro de que desea eliminar esta dirección?"
+        primaryButton={{
+          text: 'Eliminar',
+          onPress: handleDeleteDirection,
+        }}
+        secondaryButton={{
+          text: 'Cancelar',
+          onPress: () => setShowDeletePopup(false),
+        }}
+        onClose={() => setShowDeletePopup(false)}
       />
     </ScrollView>
   );
@@ -164,22 +207,6 @@ const styles = StyleSheet.create({
     marginTop: 30,
     marginBottom: 15,
   },
-  directionImage: {
-    width: 120,
-    height: 120,
-    borderRadius: 60,
-    marginBottom: 15,
-    borderWidth: 2,
-    borderColor: '#e0e0e0',
-  },
-  editButton: {
-    paddingVertical: 10,
-    paddingHorizontal: 20,
-    borderRadius: 20,
-  },
-  editButtonText: {
-    color: Colors.primary,
-  },
   directionInfo: {
     marginVertical: 20,
     borderWidth: 1,
@@ -187,30 +214,46 @@ const styles = StyleSheet.create({
     borderRadius: 10,
     backgroundColor: Colors.textWhite,
   },
-  fieldContainer: {
-    marginBottom: 15,
+  cardContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    padding: 15,
+    borderBottomWidth: 1,
+    borderColor: Colors.gray_100,
   },
-  fieldLabel: {
-    fontSize: 14,
-    color: '#666',
-    marginBottom: 5,
+  textContainer: {
+    flex: 1,
+    marginRight: 10, // Espaciado entre el texto y los íconos
   },
-  fieldValue: {
-    fontSize: 18,
-    color: '#333',
-    marginBottom: 10,
+  addressText: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
   },
-  separator: {
-    height: 1,
-    backgroundColor: '#e0e0e0',
-    marginBottom: 15,
+  cityText: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
+  },
+  additionalInfoText: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
+  },
+  referencePointText: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.primary,
   },
-  bottomEditButton: {
-    alignSelf: 'center',
-    marginTop: 20,
-    marginBottom: 40,
-    width: '50%',
+  iconContainer: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
     alignItems: 'center',
+    width: 50,
   },
 });
 
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
new file mode 100644
index 0000000..cbe3329
--- /dev/null
+++ b/src/screens/SelectLocationScreen.tsx
@@ -0,0 +1,230 @@
+import React, { useState, useRef, useEffect } from 'react';
+import { StyleSheet, View, TextInput, Alert } from 'react-native';
+import MapView, { PROVIDER_GOOGLE, Region } from 'react-native-maps'; // Importa el tipo Region
+import * as Location from 'expo-location';
+import { useRouter } from 'expo-router';
+import Button from '../components/Button';
+import { MapPinIcon } from 'react-native-heroicons/solid';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+
+const SelectLocationScreen = () => {
+  const [selectedLocation, setSelectedLocation] = useState<{
+    latitude: number;
+    longitude: number;
+  } | null>(null);
+  const [address, setAddress] = useState<string>('Cargando dirección...');
+  const [initialRegion, setInitialRegion] = useState<{
+    latitude: number;
+    longitude: number;
+    latitudeDelta: number;
+    longitudeDelta: number;
+  }>({
+    latitude: 10.0678, // Coordenadas iniciales (Barquisimeto)
+    longitude: -69.3467,
+    latitudeDelta: 0.1,
+    longitudeDelta: 0.1,
+  });
+  const mapRef = useRef<MapView>(null);
+  const router = useRouter();
+
+  // Solicitar permisos y obtener la ubicación del usuario
+  useEffect(() => {
+    const getUserLocation = async () => {
+      try {
+        const { status } = await Location.getForegroundPermissionsAsync();
+        if (status !== 'granted') {
+          const { status: newStatus } =
+            await Location.requestForegroundPermissionsAsync();
+          if (newStatus !== 'granted') {
+            Alert.alert(
+              'Permiso denegado',
+              'No se pudo obtener la ubicación. El mapa cargará en la región predeterminada.',
+            );
+            return;
+          }
+        }
+
+        const location = await Location.getCurrentPositionAsync({});
+        const userRegion = {
+          latitude: location.coords.latitude,
+          longitude: location.coords.longitude,
+          latitudeDelta: 0.01,
+          longitudeDelta: 0.01,
+        };
+
+        setInitialRegion(userRegion);
+        setSelectedLocation({
+          latitude: location.coords.latitude,
+          longitude: location.coords.longitude,
+        });
+        mapRef.current?.animateToRegion(userRegion, 1000);
+        fetchAddress(location.coords.latitude, location.coords.longitude);
+      } catch (error) {
+        console.error('Error al obtener la ubicación:', error);
+        Alert.alert(
+          'Error',
+          'Hubo un problema al obtener la ubicación. El mapa cargará en la región predeterminada.',
+        );
+      }
+    };
+
+    getUserLocation();
+  }, []);
+
+  // Obtener la dirección desde la API de Google Maps
+  const fetchAddress = async (latitude: number, longitude: number) => {
+    try {
+      const response = await fetch(
+        `https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&key=AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU`,
+      );
+      const data = await response.json();
+
+      if (data.plus_code) {
+        const plusCode = data.plus_code.compound_code || 'Código no disponible';
+        setAddress(plusCode);
+      } else if (data.results && data.results.length > 0) {
+        setAddress(data.results[0].formatted_address);
+      } else {
+        setAddress('No se pudo obtener la dirección.');
+      }
+    } catch (error) {
+      console.error('Error al obtener la dirección:', error);
+      setAddress('Error al obtener la dirección.');
+    }
+  };
+
+  const handleRegionChange = (region: Region) => {
+    setSelectedLocation({
+      latitude: region.latitude,
+      longitude: region.longitude,
+    });
+    fetchAddress(region.latitude, region.longitude);
+  };
+
+  const handleConfirmLocation = () => {
+    if (selectedLocation) {
+      console.log('Coordenadas seleccionadas:', selectedLocation); // Log para verificar las coordenadas
+      console.log('Navegando a createDirection con:', {
+        latitude: selectedLocation?.latitude,
+        longitude: selectedLocation?.longitude,
+      });
+      router.push({
+        pathname: '/createDirection',
+        params: {
+          latitude: selectedLocation.latitude.toString(),
+          longitude: selectedLocation.longitude.toString(),
+        },
+      });
+    } else {
+      console.log('No se seleccionó ninguna ubicación'); // Log para verificar si no hay ubicación seleccionada
+    }
+  };
+
+  return (
+    <View style={styles.container}>
+      {/* Header con input para mostrar la dirección */}
+      <View style={styles.header}>
+        <TextInput
+          style={styles.addressInput}
+          value={address}
+          editable={false}
+        />
+      </View>
+
+      <MapView
+        ref={mapRef}
+        provider={PROVIDER_GOOGLE}
+        style={styles.map}
+        initialRegion={initialRegion}
+        onRegionChangeComplete={handleRegionChange}
+      />
+      {/* Marker siempre centrado */}
+      <View style={styles.markerFixed}>
+        <MapPinIcon size={40} color={Colors.primary} />
+      </View>
+      {/* Footer con mensajes y botón */}
+      <View style={styles.footer}>
+        <PoppinsText style={styles.footerTitle}>Fija el marcador</PoppinsText>
+        <PoppinsText style={styles.footerSubtitle}>
+          Arrastra el mapa e indica la dirección exacta con el marcador
+        </PoppinsText>
+        <Button
+          title="Confirmar ubicación"
+          onPress={handleConfirmLocation}
+          variant="primary"
+          size="medium"
+          style={{ width: '100%' }}
+        />
+      </View>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+  },
+  header: {
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: Colors.textWhite,
+    padding: 10,
+    zIndex: 1000,
+  },
+  addressInput: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 10,
+    borderWidth: 1,
+    borderColor: Colors.stroke,
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    fontFamily: 'Poppins_400Regular',
+    color: Colors.textMain,
+    marginLeft: 48,
+  },
+  map: {
+    ...StyleSheet.absoluteFillObject,
+  },
+  markerFixed: {
+    position: 'absolute',
+    top: '50%',
+    left: '50%',
+    marginLeft: -20,
+    marginTop: -40,
+  },
+  footer: {
+    position: 'absolute',
+    bottom: 0,
+    left: 0,
+    right: 0,
+    backgroundColor: Colors.textWhite,
+    padding: 20,
+    borderTopLeftRadius: 20,
+    borderTopRightRadius: 20,
+    alignItems: 'center',
+    shadowColor: '#000',
+    shadowOffset: { width: 0, height: -2 },
+    shadowOpacity: 0.1,
+    elevation: 5,
+  },
+  footerTitle: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    fontWeight: 'bold',
+    color: Colors.textMain,
+    marginBottom: 12,
+  },
+  footerSubtitle: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.textLowContrast,
+    marginBottom: 12,
+    textAlign: 'center',
+  },
+});
+
+export default SelectLocationScreen;
diff --git a/src/services/user.ts b/src/services/user.ts
index 5cd69b2..537bf43 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,15 +1,14 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
+import { ServiceResponse, UpdateUser, UserList } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+import { decodeJWT } from '../helper/jwtHelper';
 import {
-  ServiceResponse,
-  UpdateUser,
-  UserList,
+  OrderResponse,
+  Pagination,
   UserAddressResponse,
   CreateUserAddressRequest,
-} from '../types/api.d';
-import { extractErrorMessage } from '../utils/errorHandler';
-import { decodeJWT } from '../helper/jwtHelper';
-import { OrderResponse, Pagination } from '@pharmatech/sdk';
+} from '@pharmatech/sdk';
 
 export const UserService = {
   getProfile: async (): Promise<ServiceResponse<UserList>> => {
@@ -189,6 +188,32 @@ export const UserService = {
     }
   },
 
+  deleteAddress: async (
+    id: string,
+  ): Promise<{ success: boolean; error?: string }> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      const decoded = decodeJWT(token);
+      if (!decoded || !decoded.userId) {
+        throw new Error('No se pudo decodificar el token de autenticación');
+      }
+
+      const userId = decoded.userId;
+      await api.userAdress.deleteAddress(userId, id, token);
+      return { success: true };
+    } catch (error) {
+      console.error('Error al eliminar la dirección:', error);
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
   getUserOrders: async (): Promise<
     ServiceResponse<Pagination<OrderResponse>>
   > => {

From 26f08567039632772d594458c1d6ce8561eef0da Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 01:36:32 -0400
Subject: [PATCH 116/291] Updated order id

---
 src/screens/OrdersScreen.tsx | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 1583caa..17934c7 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -21,7 +21,6 @@ const OrdersScreen = () => {
     const fetchOrders = async () => {
       try {
         const order = await UserService.getUserOrders();
-        console.log(order);
         if (order.success) {
           if (order.data.results.length > 0) {
             setOrdersList(order.data.results);
@@ -69,7 +68,7 @@ const OrdersScreen = () => {
         </PoppinsText>
       </View>
       <TouchableOpacity onPress={() => router.push(`order`)}>
-        Ver detalle de orden
+        <PoppinsText>Ver detalle de orden</PoppinsText>
       </TouchableOpacity>
       <View style={styles.orderInfo}>
         {ordersList &&
@@ -96,7 +95,7 @@ const OrdersScreen = () => {
                   }}
                 >
                   <View>
-                    <PoppinsText>{order.type}</PoppinsText>
+                    <PoppinsText>{order.id}</PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
                       {order.createdAt}
                     </PoppinsText>

From c192215d73ca7ff350d1bd9e8a4ad590cbd3855d Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 02:30:14 -0400
Subject: [PATCH 117/291] created getOrder in user service and updated
 orderDetail

---
 src/screens/OrderDetailScreen.tsx | 119 ++++++++++++++++++++----------
 src/services/user.ts              |  17 ++++-
 2 files changed, 98 insertions(+), 38 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index d4b7fe3..25bc059 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -1,15 +1,26 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, TouchableOpacity, ScrollView } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  TouchableOpacity,
+  ScrollView,
+  Image,
+} from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Button from '../components/Button';
-import { UserList } from '../types/api';
-import { useRouter } from 'expo-router';
 import { StarIcon } from 'react-native-heroicons/solid';
 import Alert from '../components/Alerts';
+import { UserService } from '../services/user';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { OrderDetailedResponse } from '@pharmatech/sdk';
 
 const OrderDetailScreen = () => {
-  const [order, setOrder] = useState<UserList>({});
+  const { id } = useLocalSearchParams<{ id: string }>();
+
+  const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
+    undefined,
+  );
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -18,7 +29,7 @@ const OrderDetailScreen = () => {
   useEffect(() => {
     const fetchOrder = async () => {
       try {
-        //const order = await UserService.getOrder();
+        const order = await UserService.getOrder(id);
 
         if (order.success) {
           setOrder(order.data);
@@ -32,6 +43,10 @@ const OrderDetailScreen = () => {
     fetchOrder();
   }, []);
 
+  const handleReorder = async () => {
+    setShowSuccessAlert(true);
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -48,10 +63,10 @@ const OrderDetailScreen = () => {
           <Alert
             type="success"
             title="Éxito"
-            message="Cuenta creada correctamente"
+            message="Pedido agregado al carrito"
             onClose={() => {
               setShowSuccessAlert(false);
-              router.replace('/success');
+              router.replace('/cart');
             }}
             borderColor
           />
@@ -76,69 +91,99 @@ const OrderDetailScreen = () => {
         >
           <View>
             <PoppinsText>Número de pedido:</PoppinsText>
-            <PoppinsText>#430960</PoppinsText>
+            <PoppinsText>{order?.id}</PoppinsText>
           </View>
           <Button
             title="Re ordenar"
             size="small"
             style={{ paddingVertical: 0 }}
+            onPress={handleReorder}
           />
         </View>
-        <View>
-          <View style={{ flexDirection: 'row', marginVertical: 10 }}>
+        <ScrollView style={{ height: 400 }}>
+          {order?.details.map((detail, index) => (
             <View
-              style={{
-                width: 100,
-                backgroundColor: Colors.gray_100,
-                marginRight: 5,
-                borderRadius: 10,
-              }}
-            ></View>
-            <View style={{ flex: 1 }}>
-              <PoppinsText>Omeprazol</PoppinsText>
+              key={index}
+              style={{ flexDirection: 'row', marginVertical: 10 }}
+            >
               <View
                 style={{
-                  flexDirection: 'row',
-                  justifyContent: 'space-between',
-                  margin: 10,
+                  width: 100,
+                  backgroundColor: Colors.gray_100,
+                  marginRight: 5,
+                  borderRadius: 10,
                 }}
               >
-                <PoppinsText>$5.00</PoppinsText>
-                <PoppinsText>Cantidad: 1</PoppinsText>
+                <Image
+                  source={{
+                    uri: detail.productPresentation.product.images[0].url,
+                  }}
+                  style={{ flex: 1 }}
+                />
               </View>
-              <View style={{ flexDirection: 'row', alignContent: 'center' }}>
-                <StarIcon color={Colors.gray_100} />
-                <TouchableOpacity>
-                  <PoppinsText>Ir al producto</PoppinsText>
-                </TouchableOpacity>
+              <View style={{ flex: 1 }}>
+                <PoppinsText>
+                  {detail.productPresentation.presentation.name}
+                </PoppinsText>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    margin: 10,
+                  }}
+                >
+                  <PoppinsText>${detail.subtotal}</PoppinsText>
+                  <PoppinsText>Cantidad: {detail.quantity}</PoppinsText>
+                </View>
+                <View style={{ flexDirection: 'row', alignContent: 'center' }}>
+                  <StarIcon color={Colors.gray_100} />
+                  <TouchableOpacity
+                    onPress={() =>
+                      router.push(`products/${detail.productPresentation.id}`)
+                    }
+                  >
+                    <PoppinsText>Ir al producto</PoppinsText>
+                  </TouchableOpacity>
+                </View>
               </View>
             </View>
-          </View>
-        </View>
-        <View style={{ marginHorizontal: 20 }}>
+          ))}
+        </ScrollView>
+        <View
+          style={{
+            marginHorizontal: 20,
+            backgroundColor: '#f1f5fd',
+            padding: 10,
+            borderRadius: 10,
+          }}
+        >
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Subtotal</PoppinsText>
-            <PoppinsText>$0</PoppinsText>
+            <PoppinsText>${order?.totalPrice}</PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
-            <PoppinsText>Descuentos</PoppinsText>
-            <PoppinsText>-$0</PoppinsText>
+            <PoppinsText style={{ color: Colors.semanticSuccess }}>
+              Descuentos
+            </PoppinsText>
+            <PoppinsText style={{ color: Colors.semanticSuccess }}>
+              -${order?.totalPrice}
+            </PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>IVA</PoppinsText>
-            <PoppinsText>$0</PoppinsText>
+            <PoppinsText>${order?.totalPrice}</PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Total</PoppinsText>
-            <PoppinsText>$0</PoppinsText>
+            <PoppinsText>${order?.totalPrice}</PoppinsText>
           </View>
         </View>
       </View>
diff --git a/src/services/user.ts b/src/services/user.ts
index 537bf43..5dcc899 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -8,6 +8,7 @@ import {
   Pagination,
   UserAddressResponse,
   CreateUserAddressRequest,
+  OrderDetailedResponse,
 } from '@pharmatech/sdk';
 
 export const UserService = {
@@ -231,7 +232,7 @@ export const UserService = {
       }
 
       const userId = decoded.userId;
-      const response = await await api.order.findAll({
+      const response = await api.order.findAll({
         page: 1,
         limit: 10,
         userId: userId,
@@ -244,4 +245,18 @@ export const UserService = {
       };
     }
   },
+
+  getOrder: async (
+    id: string,
+  ): Promise<ServiceResponse<OrderDetailedResponse>> => {
+    try {
+      const response = await api.order.getById(id);
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From d860e808dfb1bdb984f52c5b898552aa0bf28e39 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 13:05:24 -0400
Subject: [PATCH 118/291] Resolved errors

---
 src/components/Avatar.tsx             |  3 +-
 src/screens/DirectionChangeScreen.tsx | 13 +++++--
 src/screens/ProductDetailScreen.tsx   | 52 +++++++++++++++------------
 src/screens/tab/HomeScreen.tsx        |  2 +-
 src/services/products.ts              | 45 +++++++++++++++++++----
 src/services/user.ts                  |  3 +-
 6 files changed, 84 insertions(+), 34 deletions(-)

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index cac9b2b..5fa90da 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -40,7 +40,8 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
 
       const response = await UserService.getProfile();
       if (response.success) {
-        const { firstName, lastName, profilePicture } = response.data!;
+        const { firstName, lastName } = response.data!;
+        const profilePicture = response.data.profile.profilePicture;
         setProfile({
           uri: profilePicture,
           name: `${firstName} ${lastName}`,
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index eff562a..2fb1c96 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -12,6 +12,7 @@ import Alert from '../components/Alerts';
 import { StateService } from '../services/state';
 import { State, CityResponse } from '../types/api';
 import Dropdown from '../components/Dropdown';
+import { CreateUserAddressRequest } from '@pharmatech/sdk';
 
 const ChangeDirectionScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -83,12 +84,14 @@ const ChangeDirectionScreen = () => {
 
     setLoading(true);
     try {
-      const updatedAddress = {
+      const updatedAddress: CreateUserAddressRequest = {
         adress: address.adress,
         zipCode: address.zipCode,
         cityId: selectedCity,
         additionalInformation: address.additionalInformation,
         referencePoint: address.referencePoint,
+        latitude: null,
+        longitude: null,
       };
 
       const response = id
@@ -211,7 +214,11 @@ const ChangeDirectionScreen = () => {
         />
         <Input
           label="Información adicional:"
-          value={address?.additionalInformation}
+          value={
+            address.additionalInformation
+              ? address.additionalInformation
+              : undefined
+          }
           isEditable={isEditable}
           border={isEditable ? 'default' : 'none'}
           getValue={(value) =>
@@ -222,7 +229,7 @@ const ChangeDirectionScreen = () => {
         />
         <Input
           label="Punto de referencia:"
-          value={address?.referencePoint}
+          value={address.referencePoint ? address.referencePoint : undefined}
           isEditable={isEditable}
           border={isEditable ? 'default' : 'none'}
           getValue={(value) =>
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index afd579e..2dc0234 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -35,7 +35,7 @@ import BranchMap from '../components/BranchMap';
 type Product = {
   id: string;
   name: string;
-  description: string;
+  description: string | undefined;
   rating: number;
   discount: number;
   presentation: { id: string; description: string; price: number }[];
@@ -109,7 +109,11 @@ const ProductDetailScreen: React.FC = () => {
 
   useEffect(() => {
     const obtainProducts = async () => {
-      const productsData = await ProductService.getProduct(id);
+      const productsData = await ProductService.getGenericProduct(id);
+      const productsPresentation =
+        await ProductService.getProductPresentations(id);
+      const productsImage = await ProductService.getProductImages(id);
+
       const states = await StateService.getStates(1, 40);
 
       if (states.success) {
@@ -120,28 +124,32 @@ const ProductDetailScreen: React.FC = () => {
         setProduct({
           id: productsData.data.id,
           name: productsData.data.name,
-          description: productsData.data.description,
-          rating: productsData.data.rating,
-          images: productsData.data.images.map(
-            (image: { url: string }) => image.url,
-          ),
+          description: productsPresentation.success
+            ? productsData.data.description
+            : undefined,
+          rating: 0,
+          images: productsImage.success
+            ? productsImage.data.map((image: { url: string }) => image.url)
+            : [],
           discount: 10,
-          presentation: productsData.data.presentation.map(
-            (presentation: {
-              id: string;
-              presentation: { description: string };
-              price: number;
-            }) => ({
-              id: presentation.id,
-              description: presentation.presentation.description,
-              price: presentation.price,
-            }),
-          ),
+          presentation: productsPresentation.success
+            ? productsPresentation.data.map(
+                (presentation: {
+                  id: string;
+                  presentation: { description: string };
+                  price: number;
+                }) => ({
+                  id: presentation.id,
+                  description: presentation.presentation.description,
+                  price: presentation.price,
+                }),
+              )
+            : [],
         });
 
-        setCurrentPrice(productsData.data.presentation[0].price);
-      } else {
-        console.log(productsData.error);
+        setCurrentPrice(
+          productsPresentation.success ? productsPresentation.data[0].price : 0,
+        );
       }
     };
 
@@ -174,7 +182,7 @@ const ProductDetailScreen: React.FC = () => {
               const updatedInventory = [...prevInventory];
               newInventory.forEach((newItem) => {
                 if (!prevInventory.some((item) => item.id === newItem.id)) {
-                  updatedInventory.push(newItem);
+                  updatedInventory.push(newItem as Inventory);
                 }
               });
               return updatedInventory;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 7125367..cb71a75 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -20,7 +20,7 @@ export default function HomeScreen() {
     useLocalSearchParams();
   const { cartItems, addToCart, updateCartQuantity, setCartUserId } = useCart();
 
-  const getItemQuantity = (productId: number) => {
+  const getItemQuantity = (productId: string) => {
     const cartItem = cartItems.find((item) => item.id === productId.toString());
     return cartItem ? cartItem.quantity : 0;
   };
diff --git a/src/services/products.ts b/src/services/products.ts
index 6a2dd50..d10f82a 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -1,9 +1,12 @@
 import { api } from '../lib/sdkConfig';
 import {
-  ServiceResponse,
   Pagination,
   ProductPresentation,
-} from '../types/api.d';
+  GenericProductResponse,
+  ProductPresentationResponse,
+  ProductImage,
+} from '@pharmatech/sdk';
+import { ServiceResponse } from '../types/api';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const ProductService = {
@@ -26,11 +29,11 @@ export const ProductService = {
     }
   },
 
-  getProduct: async (id: string): Promise<ProductPresentation> => {
+  getGenericProduct: async (
+    id: string,
+  ): Promise<ServiceResponse<GenericProductResponse>> => {
     try {
-      const product: ProductPresentation = await api.genericProduct.getById(id);
-      product.presentation = await api.productPresentation.getByProductId(id);
-      product.images = await api.productImage.getByProductId(id);
+      const product = await api.genericProduct.getById(id);
 
       return { success: true, data: product };
     } catch (error) {
@@ -40,4 +43,34 @@ export const ProductService = {
       };
     }
   },
+
+  getProductPresentations: async (
+    id: string,
+  ): Promise<ServiceResponse<ProductPresentationResponse[]>> => {
+    try {
+      const presentation = await api.productPresentation.getByProductId(id);
+
+      return { success: true, data: presentation };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
+  getProductImages: async (
+    id: string,
+  ): Promise<ServiceResponse<ProductImage[]>> => {
+    try {
+      const images = await api.productImage.getByProductId(id);
+
+      return { success: true, data: images };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };
diff --git a/src/services/user.ts b/src/services/user.ts
index 5dcc899..a4cf7cb 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -1,9 +1,10 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, UpdateUser, UserList } from '../types/api.d';
+import { ServiceResponse, UpdateUser } from '../types/api.d';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { decodeJWT } from '../helper/jwtHelper';
 import {
+  UserList,
   OrderResponse,
   Pagination,
   UserAddressResponse,

From 5a9edb396e2470c35efe8cce13b63e359f948a5f Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 19 Apr 2025 15:55:06 -0400
Subject: [PATCH 119/291] Changes to avoid conflicts

---
 package-lock.json         |  8 ++---
 package.json              |  2 +-
 src/components/Avatar.tsx | 65 +++++++++++----------------------------
 3 files changed, 23 insertions(+), 52 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8110c6b..8f37b9b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.1",
+        "@pharmatech/sdk": "^0.4.3",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3585,9 +3585,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.1.tgz",
-      "integrity": "sha512-rAvQIGZ5fketJt+QaX+8uWI2DIYOTA7AVUny866grofraFeTkkGOHmL5r6V8w2CobHKaAKXAlvnrAL8yPSN5Gw==",
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
+      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index a37420a..fd2f9d8 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.1",
+    "@pharmatech/sdk": "^0.4.3",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 66a8bb2..5fa90da 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,16 +1,15 @@
 import React, { useEffect, useState } from 'react';
 import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
-import { Colors } from '../styles/theme';
+import { Colors, FontSizes } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
 
-interface AvatarProps {
-  size?: number; // Propiedad para definir el tamaño del avatar
-  model?: 'default' | 'small'; // Propiedad para diferenciar entre modelos
-}
+type AvatarProps = {
+  scale?: number;
+};
 
-const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
+const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
   const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
   const [loading, setLoading] = useState(true);
 
@@ -24,6 +23,7 @@ const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
           'No se encontró el token de autenticación. Usando datos locales.',
         );
 
+        // Data from secureStore
         const userData = await SecureStore.getItemAsync('user_data');
         if (userData) {
           const { firstName, lastName } = JSON.parse(userData);
@@ -40,7 +40,8 @@ const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
 
       const response = await UserService.getProfile();
       if (response.success) {
-        const { firstName, lastName, profilePicture } = response.data!;
+        const { firstName, lastName } = response.data!;
+        const profilePicture = response.data.profile.profilePicture;
         setProfile({
           uri: profilePicture,
           name: `${firstName} ${lastName}`,
@@ -55,60 +56,26 @@ const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
   }, []);
 
   const getInitials = (fullName: string): string => {
+    console.log('Full Name:', fullName);
     const words = fullName.trim().split(' ');
     if (words.length === 1) return words[0].charAt(0).toUpperCase();
     return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
   };
 
-  const avatarSize = model === 'small' ? 20 : size;
-  const fontSize = avatarSize / 2.5;
-  const lineHeight = fontSize + 1;
-  const marginTop = avatarSize / 10;
   if (loading) {
     return (
-      <View
-        style={[
-          styles.avatarContainer,
-          styles.loadingContainer,
-          {
-            width: avatarSize,
-            height: avatarSize,
-            borderRadius: avatarSize / 2,
-          },
-        ]}
-      >
+      <View style={[styles.avatarContainer, styles.loadingContainer]}>
         <ActivityIndicator color={Colors.textWhite} />
       </View>
     );
   }
 
   return (
-    <View
-      style={[
-        styles.avatar,
-        { width: avatarSize, height: avatarSize, borderRadius: avatarSize / 2 },
-      ]}
-    >
+    <View style={[styles.avatar, { width: scale, height: scale }]}>
       {profile.uri ? (
-        <Image
-          source={{ uri: profile.uri }}
-          style={[
-            styles.avatarImage,
-            { width: avatarSize, height: avatarSize },
-          ]}
-        />
+        <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
       ) : (
-        <PoppinsText
-          style={[
-            styles.initials,
-            {
-              fontSize: fontSize,
-              lineHeight: lineHeight,
-              marginTop: marginTop,
-            },
-          ]}
-          weight="semibold"
-        >
+        <PoppinsText style={styles.initials} weight="semibold">
           {profile.name ? getInitials(profile.name) : ''}
         </PoppinsText>
       )}
@@ -118,17 +85,21 @@ const Avatar: React.FC<AvatarProps> = ({ size = 32, model = 'default' }) => {
 
 const styles = StyleSheet.create({
   avatar: {
+    borderRadius: 100,
     backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
     overflow: 'hidden',
   },
   avatarImage: {
+    width: 32,
+    height: 32,
     resizeMode: 'cover',
   },
   initials: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textWhite,
-    textAlign: 'center',
   },
   avatarContainer: {
     backgroundColor: Colors.primary,

From 50a8e6886dfffe7f0afa84b53533f3af6d378c89 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 19 Apr 2025 15:56:10 -0400
Subject: [PATCH 120/291] -Merge branch 'dev' into feature/APP-M-9/Checkout
 Refactor -LocationSelector and CheckoutScreen to integrate user address
 fetching and improve navigation; update DirectionCreateScreen and
 SelectLocationScreen for enhanced routing; clean up unused OrderResponse type
 in api.d.ts.

---
 src/components/AddAddressModal.tsx    | 110 --------------------------
 src/components/LocationSelector.tsx   |  51 ++++++++----
 src/screens/CheckoutScreen.tsx        |  26 +++++-
 src/screens/DirectionCreateScreen.tsx |   8 +-
 src/screens/SelectLocationScreen.tsx  |   1 +
 src/types/api.d.ts                    |   7 --
 6 files changed, 64 insertions(+), 139 deletions(-)
 delete mode 100644 src/components/AddAddressModal.tsx

diff --git a/src/components/AddAddressModal.tsx b/src/components/AddAddressModal.tsx
deleted file mode 100644
index 8d4d15c..0000000
--- a/src/components/AddAddressModal.tsx
+++ /dev/null
@@ -1,110 +0,0 @@
-import React, { useState } from 'react';
-import { Modal, View, StyleSheet, TouchableOpacity } from 'react-native';
-import { XMarkIcon } from 'react-native-heroicons/solid';
-import PoppinsText from './PoppinsText';
-import { Colors } from '../styles/theme';
-import Input from './Input';
-import Button from './Button';
-
-const AddAddressModal = ({
-  visible,
-  onClose,
-}: {
-  visible: boolean;
-  onClose: () => void;
-}) => {
-  const [address, setAddress] = useState('');
-  const [postalCode, setPostalCode] = useState('');
-  const [additionalInfo, setAdditionalInfo] = useState('');
-  const [referencePoint, setReferencePoint] = useState('');
-
-  return (
-    <Modal transparent visible={visible} animationType="fade">
-      <View style={styles.overlay}>
-        <View style={styles.modal}>
-          <TouchableOpacity onPress={onClose} style={styles.closeButton}>
-            <XMarkIcon size={24} color={Colors.textMain} />
-          </TouchableOpacity>
-
-          <PoppinsText style={styles.title}>Nueva Dirección</PoppinsText>
-          <Input
-            placeholder="Dirección"
-            value={address}
-            getValue={setAddress}
-            backgroundColor="none"
-          />
-          <Input
-            placeholder="Código Postal"
-            value={postalCode}
-            getValue={setPostalCode}
-            fieldType="number"
-            backgroundColor="none"
-          />
-          <Input
-            placeholder="Información Adicional"
-            value={additionalInfo}
-            getValue={setAdditionalInfo}
-            backgroundColor="none"
-          />
-          <Input
-            placeholder="Punto de Referencia"
-            value={referencePoint}
-            getValue={setReferencePoint}
-            backgroundColor="none"
-          />
-          <View style={styles.buttonContainer}>
-            <Button title="Guardar" onPress={() => {}} variant="primary" />
-          </View>
-        </View>
-      </View>
-    </Modal>
-  );
-};
-
-const styles = StyleSheet.create({
-  overlay: {
-    flex: 1,
-    backgroundColor: 'rgba(0,0,0,0.4)',
-    justifyContent: 'center',
-    alignItems: 'center',
-  },
-  modal: {
-    width: 352,
-    backgroundColor: Colors.menuWhite,
-    borderRadius: 16,
-    padding: 20,
-    alignItems: 'center',
-    position: 'relative',
-  },
-  closeButton: {
-    position: 'absolute',
-    top: 20,
-    right: 20,
-    zIndex: 10,
-  },
-  title: {
-    fontSize: 16,
-    fontWeight: '600',
-    color: Colors.textMain,
-    textAlign: 'center',
-    marginTop: 20,
-    marginBottom: 16,
-  },
-  input: {
-    width: '100%',
-    height: 48,
-    borderWidth: 1,
-    borderColor: Colors.gray_100,
-    borderRadius: 8,
-    paddingHorizontal: 12,
-    color: Colors.textMain,
-    fontSize: 14,
-    marginBottom: 20,
-  },
-  buttonContainer: {
-    width: '100%',
-    marginTop: 20,
-  },
-});
-
-export default AddAddressModal;
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index 34ff6fe..be3c8c8 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -1,5 +1,6 @@
 import { useEffect, useState } from 'react';
 import { View, StyleSheet, TouchableOpacity } from 'react-native';
+import { useRouter } from 'expo-router';
 import Dropdown from './Dropdown';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
@@ -7,7 +8,7 @@ import { BranchService } from '../services/branches';
 import { extractErrorMessage } from '../utils/errorHandler';
 import { MapPinIcon } from 'react-native-heroicons/solid';
 import BranchMapModal from './BranchMapModal';
-import AddAddressModal from './AddAddressModal';
+import { UserService } from '../services/user';
 
 type Branch = {
   id: string;
@@ -23,15 +24,13 @@ const LocationSelector = ({
   selectedOption: 'pickup' | 'delivery' | null;
   onSelect: (value: string | null) => void;
 }) => {
+  const router = useRouter();
   const [pickupBranches, setPickupBranches] = useState<Branch[]>([]);
-  const [deliveryData] = useState([
-    'Dirección 1',
-    'Dirección 2',
-    'Dirección 3',
-  ]);
+  const [deliveryAddresses, setDeliveryAddresses] = useState<
+    { id: string; address: string }[]
+  >([]); // Store both UUID and address
   const [dropdownKey, setDropdownKey] = useState(0);
   const [modalVisible, setModalVisible] = useState(false);
-  const [addAddressModalVisible, setAddAddressModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
 
   useEffect(() => {
@@ -51,6 +50,25 @@ const LocationSelector = ({
         } catch (error) {
           console.error('Error fetching branches:', extractErrorMessage(error));
         }
+      } else if (selectedOption === 'delivery') {
+        try {
+          const response = await UserService.getUserDirections();
+          if (response.success) {
+            setDeliveryAddresses(
+              response.data.map((address) => ({
+                id: address.id,
+                address: address.adress,
+              })),
+            );
+          } else {
+            console.error('Error fetching addresses:', response.error);
+          }
+        } catch (error) {
+          console.error(
+            'Error fetching addresses:',
+            extractErrorMessage(error),
+          );
+        }
       }
     };
 
@@ -60,7 +78,7 @@ const LocationSelector = ({
   const options =
     selectedOption === 'pickup'
       ? pickupBranches.map((branch) => branch.name)
-      : deliveryData;
+      : deliveryAddresses.map((item) => item.address);
 
   if (!selectedOption) return null;
 
@@ -80,9 +98,12 @@ const LocationSelector = ({
           if (selectedOption === 'pickup') {
             const branch = pickupBranches.find((b) => b.name === val);
             setSelectedBranch(branch || null);
-            onSelect(branch ? branch.id : null); // Pass the branch ID (UUID) instead of the name
+            onSelect(branch ? branch.id : null);
           } else {
-            onSelect(val); // For delivery, pass the selected address
+            const selectedAddress = deliveryAddresses.find(
+              (item) => item.address === val,
+            );
+            onSelect(selectedAddress ? selectedAddress.id : null);
           }
         }}
         borderColor={Colors.gray_100}
@@ -93,7 +114,10 @@ const LocationSelector = ({
         onPress={() =>
           selectedOption === 'pickup'
             ? setModalVisible(true)
-            : setAddAddressModalVisible(true)
+            : router.push({
+                pathname: '/selectLocation',
+                params: { fromCheckout: 'true' }, // Convertimos a cadena
+              })
         }
         disabled={selectedOption === 'pickup' && !selectedBranch}
       >
@@ -131,11 +155,6 @@ const LocationSelector = ({
             : null
         }
       />
-
-      <AddAddressModal
-        visible={addAddressModalVisible}
-        onClose={() => setAddAddressModalVisible(false)}
-      />
     </View>
   );
 };
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index c01b79e..da6f815 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState } from 'react';
+import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import {
   ShoppingBagIcon,
@@ -38,6 +38,17 @@ const CheckoutScreen = () => {
   const [couponDiscount, setCouponDiscount] = useState(0);
   const [isCouponApplied, setIsCouponApplied] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
+  const [userName, setUserName] = useState<string | null>('Usuario');
+
+  useEffect(() => {
+    const fetchUserName = async () => {
+      const storedUserName = await localStorage.getItem('userName');
+      if (storedUserName) {
+        setUserName(storedUserName);
+      }
+    };
+    fetchUserName();
+  }, []);
 
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
@@ -89,6 +100,13 @@ const CheckoutScreen = () => {
             return;
           }
 
+          if (selectedOption === 'delivery' && !isValidUUID(selectedLocation)) {
+            setErrorMessage('La dirección seleccionada no es válida.');
+            setStatus('rejected');
+            setCurrentStep(stepsLabels.length);
+            return;
+          }
+
           if (!selectedOption) {
             setErrorMessage('Debe seleccionar una opción de compra.');
             setStatus('rejected');
@@ -332,7 +350,7 @@ const CheckoutScreen = () => {
             <PaymentStatusMessage
               status={status}
               orderNumber={'N/A'}
-              userName={'Usuario'}
+              userName={userName || 'Usuario'} // Ensure the correct userName is passed
             />
             <View style={styles.confirmationContainer}>
               {renderConfirmationContent(status)}
@@ -423,7 +441,7 @@ const styles = StyleSheet.create({
   purchaseOptionsTitle: {
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
-    marginBottom: 24,
+    marginBottom: 30,
     alignSelf: 'flex-start',
     paddingHorizontal: 20,
   },
@@ -514,7 +532,7 @@ const styles = StyleSheet.create({
     fontSize: FontSizes.b1.size,
     lineHeight: FontSizes.b1.lineHeight,
     color: Colors.textMain,
-    textAlign: 'center',
+    textAlign: 'left',
     marginBottom: 10,
   },
   sucursalText: {
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index bb414ca..847ab4f 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -14,7 +14,7 @@ import { State, CityResponse } from '../types/api';
 import Dropdown from '../components/Dropdown';
 
 const DirectionCreateScreen = () => {
-  const { latitude, longitude } = useLocalSearchParams();
+  const { latitude, longitude, fromCheckout } = useLocalSearchParams();
 
   console.log('Parámetros recibidos en DirectionCreateScreen:', {
     latitude,
@@ -99,7 +99,11 @@ const DirectionCreateScreen = () => {
       if (response.success) {
         setShowSuccessAlert(true);
         setTimeout(() => {
-          router.replace('/direction'); // Redirige al listado de direcciones después de 2 segundos
+          if (fromCheckout === 'true') {
+            router.push('/checkout');
+          } else {
+            router.replace('/direction');
+          }
         }, 2000);
       } else {
         setShowErrorAlert(true);
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index cbe3329..33f6a60 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -114,6 +114,7 @@ const SelectLocationScreen = () => {
         params: {
           latitude: selectedLocation.latitude.toString(),
           longitude: selectedLocation.longitude.toString(),
+          fromCheckout: 'true', // Convertimos a cadena
         },
       });
     } else {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index c7f4d0d..d79b3ba 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -190,13 +190,6 @@ export interface CreateOrder {
   }[];
 }
 
-export interface OrderResponse extends BaseModel {
-  id: string;
-  type: OrderType;
-  status: OrderStatus;
-  totalPrice: number;
-}
-
 export enum PaymentMethod {
   CARD = 'card',
   MOBILE_PAYMENT = 'mobile_payment',

From 1d47097ee39a08a3f0e9a2f25032755b22d652ff Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 19 Apr 2025 16:39:27 -0400
Subject: [PATCH 121/291] Updating to new sdk and fixing avatar

---
 package-lock.json                   |  9 +++--
 package.json                        |  6 +--
 src/components/Avatar.tsx           | 57 ++++++++++++++++++++++-------
 src/components/HistoryOrderCard.tsx |  2 +-
 4 files changed, 53 insertions(+), 21 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea0c4f3..fe72bd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.3",
+        "@pharmatech/sdk": "^0.4.4",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3587,9 +3587,10 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
-      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.4.tgz",
+      "integrity": "sha512-kquo9r+V2JFvk8AQ99RhH88qI50TIiRY4UrLYrDkC2yLUSCpJrBoA9PEe8b8W8Zt3E9BpzqHEbbZ+7tp7l+ZhA==",
+      "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 2dc1999..b6ea0ed 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,13 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.3",
+    "@pharmatech/sdk": "^0.4.4",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
     "expo-font": "~13.0.4",
+    "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
     "expo-location": "^18.0.10",
     "expo-modules-core": "^2.2.2",
@@ -47,8 +48,7 @@
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17",
-    "expo-image-picker": "~16.0.6"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 5fa90da..2efaad7 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
-import { Colors, FontSizes } from '../styles/theme';
+import { Colors } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
 
 type AvatarProps = {
-  scale?: number;
+  scale?: number; // Propiedad para definir el tamaño del avatar
 };
 
 const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
@@ -23,7 +23,6 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
           'No se encontró el token de autenticación. Usando datos locales.',
         );
 
-        // Data from secureStore
         const userData = await SecureStore.getItemAsync('user_data');
         if (userData) {
           const { firstName, lastName } = JSON.parse(userData);
@@ -56,26 +55,62 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
   }, []);
 
   const getInitials = (fullName: string): string => {
-    console.log('Full Name:', fullName);
     const words = fullName.trim().split(' ');
     if (words.length === 1) return words[0].charAt(0).toUpperCase();
     return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
   };
 
+  // Cálculo dinámico de tamaño y fuentes
+  const avatarSize = scale;
+  const fontSize = avatarSize / 2.5;
+  const lineHeight = fontSize + 1;
+  const marginTop = avatarSize / 10;
+
   if (loading) {
     return (
-      <View style={[styles.avatarContainer, styles.loadingContainer]}>
+      <View
+        style={[
+          styles.avatarContainer,
+          styles.loadingContainer,
+          {
+            width: avatarSize,
+            height: avatarSize,
+            borderRadius: avatarSize / 2,
+          },
+        ]}
+      >
         <ActivityIndicator color={Colors.textWhite} />
       </View>
     );
   }
 
   return (
-    <View style={[styles.avatar, { width: scale, height: scale }]}>
+    <View
+      style={[
+        styles.avatar,
+        { width: avatarSize, height: avatarSize, borderRadius: avatarSize / 2 },
+      ]}
+    >
       {profile.uri ? (
-        <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
+        <Image
+          source={{ uri: profile.uri }}
+          style={[
+            styles.avatarImage,
+            { width: avatarSize, height: avatarSize },
+          ]}
+        />
       ) : (
-        <PoppinsText style={styles.initials} weight="semibold">
+        <PoppinsText
+          style={[
+            styles.initials,
+            {
+              fontSize: fontSize,
+              lineHeight: lineHeight,
+              marginTop: marginTop,
+            },
+          ]}
+          weight="semibold"
+        >
           {profile.name ? getInitials(profile.name) : ''}
         </PoppinsText>
       )}
@@ -85,21 +120,17 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
 
 const styles = StyleSheet.create({
   avatar: {
-    borderRadius: 100,
     backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
     overflow: 'hidden',
   },
   avatarImage: {
-    width: 32,
-    height: 32,
     resizeMode: 'cover',
   },
   initials: {
-    fontSize: FontSizes.label.size,
-    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textWhite,
+    textAlign: 'center',
   },
   avatarContainer: {
     backgroundColor: Colors.primary,
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index db3e982..d53d5e8 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -62,7 +62,7 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           <PoppinsText style={styles.detailText}>{address}</PoppinsText>
         </View>
         <View style={styles.detailRow}>
-          <Avatar model="small" />
+          <Avatar scale={20} />
           <PoppinsText style={styles.detailText}>{userName}</PoppinsText>
         </View>
         <View style={styles.detailRow}>

From 83f2b8a1bfd42c1ab1bd8c664638f8af4081bbc2 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 18:30:34 -0400
Subject: [PATCH 122/291] Added notifications screen

---
 package-lock.json                   |   8 +-
 package.json                        |   2 +-
 src/app/_layout.tsx                 |   4 +
 src/app/notifications.tsx           |   2 +
 src/components/TopBar.tsx           |  18 ++-
 src/screens/NotificationsScreen.tsx | 176 ++++++++++++++++++++++++++++
 src/services/notifications.ts       |  27 +++++
 7 files changed, 231 insertions(+), 6 deletions(-)
 create mode 100644 src/app/notifications.tsx
 create mode 100644 src/screens/NotificationsScreen.tsx
 create mode 100644 src/services/notifications.ts

diff --git a/package-lock.json b/package-lock.json
index ea0c4f3..5b4f4b4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.3",
+        "@pharmatech/sdk": "^0.4.4",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3587,9 +3587,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
-      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.4.tgz",
+      "integrity": "sha512-kquo9r+V2JFvk8AQ99RhH88qI50TIiRY4UrLYrDkC2yLUSCpJrBoA9PEe8b8W8Zt3E9BpzqHEbbZ+7tp7l+ZhA==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 2dc1999..ffc8734 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.3",
+    "@pharmatech/sdk": "^0.4.4",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 229d4e5..48dc396 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -73,6 +73,10 @@ export default function RootLayout() {
           name="profile"
           options={{ headerTitle: '', headerTransparent: true }}
         />
+        <Stack.Screen
+          name="notifications"
+          options={{ headerTitle: '', headerTransparent: true }}
+        />
         <Stack.Screen
           name="menu"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/notifications.tsx b/src/app/notifications.tsx
new file mode 100644
index 0000000..58b88a6
--- /dev/null
+++ b/src/app/notifications.tsx
@@ -0,0 +1,2 @@
+import NotificationsScreen from '../screens/NotificationsScreen';
+export default NotificationsScreen;
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index d73577e..bca5aac 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import { ShoppingCartIcon } from 'react-native-heroicons/outline';
+import { BellIcon, ShoppingCartIcon } from 'react-native-heroicons/outline';
 import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
@@ -59,6 +59,22 @@ const TopBar = () => {
           <Logo width={118} height={48} />
         </View>
 
+        <TouchableOpacity
+          style={{ paddingRight: 10 }}
+          onPress={() => {
+            router.push('/notifications');
+          }}
+        >
+          <BellIcon size={26} color={Colors.textMain} />
+          {totalCartQuantity > 0 && (
+            <View style={styles.badgeContainer}>
+              <Badge variant="filled" color="primary" size="tiny">
+                {totalCartQuantity}
+              </Badge>
+            </View>
+          )}
+        </TouchableOpacity>
+
         {/* Right cart icon with badge */}
         <TouchableOpacity
           style={styles.iconButton}
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
new file mode 100644
index 0000000..89ecb42
--- /dev/null
+++ b/src/screens/NotificationsScreen.tsx
@@ -0,0 +1,176 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import Alert from '../components/Alerts';
+import { NotificationService } from '../services/notifications';
+import { NotificationResponse } from '@pharmatech/sdk';
+
+export default function NotificationsScreen() {
+  /* const [notificationsList, setNotificationsList] = useState<OrderResponse[] | undefined>(
+		undefined,
+	); */
+  const [notificationsList, setNotificationsList] = useState<
+    Partial<NotificationResponse>[] | undefined
+  >([
+    {
+      title: 'Notificacion',
+      message: 'Esta es una notificacion',
+      date: 'pepe',
+    },
+  ]);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+
+  useEffect(() => {
+    const fetchOrders = async () => {
+      try {
+        const notifications = await NotificationService.getNotifications();
+        if (notifications.success) {
+          if (notifications.data.results.length > 0) {
+            setNotificationsList(notifications.data.results);
+          }
+        }
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ha ocurrido un error');
+        setShowErrorAlert(true);
+      }
+    };
+
+    fetchOrders();
+  }, []);
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+      </View>
+      <View style={styles.orderHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
+          Notificaciones
+        </PoppinsText>
+      </View>
+      <View style={styles.orderInfo}>
+        {notificationsList &&
+          notificationsList.length > 0 &&
+          notificationsList.map((nt, index) => (
+            <View
+              key={index}
+              style={{
+                flexDirection: 'row',
+                paddingHorizontal: 10,
+                marginVertical: 5,
+              }}
+            >
+              <View></View>
+              <View style={{ paddingVertical: 10, flex: 1 }}>
+                <View>
+                  <View
+                    style={{
+                      flexDirection: 'row',
+                      justifyContent: 'space-between',
+                    }}
+                  >
+                    <PoppinsText>{nt.title}</PoppinsText>
+                    <PoppinsText
+                      style={{
+                        color: Colors.textLowContrast,
+                        fontSize: FontSizes.c1.size,
+                      }}
+                    >
+                      {nt.date}
+                    </PoppinsText>
+                  </View>
+                  <View>
+                    <PoppinsText
+                      style={{
+                        color: Colors.textLowContrast,
+                        fontSize: FontSizes.c1.size,
+                      }}
+                    >
+                      {nt.message}
+                    </PoppinsText>
+                  </View>
+                </View>
+              </View>
+            </View>
+          ))}
+      </View>
+    </ScrollView>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  orderHeader: {
+    alignItems: 'center',
+    marginTop: 30,
+    marginBottom: 15,
+  },
+  orderImage: {
+    width: 120,
+    height: 120,
+    borderRadius: 60,
+    marginBottom: 15,
+    borderWidth: 2,
+    borderColor: '#e0e0e0',
+  },
+  editButton: {
+    paddingVertical: 10,
+    paddingHorizontal: 20,
+    borderRadius: 20,
+  },
+  editButtonText: {
+    color: Colors.primary,
+  },
+  orderInfo: {
+    marginVertical: 5,
+  },
+  fieldContainer: {
+    marginBottom: 15,
+  },
+  fieldLabel: {
+    fontSize: 14,
+    color: '#666',
+    marginBottom: 5,
+  },
+  fieldValue: {
+    fontSize: 18,
+    color: '#333',
+    marginBottom: 10,
+  },
+  separator: {
+    height: 1,
+    backgroundColor: '#e0e0e0',
+    marginBottom: 15,
+  },
+  bottomEditButton: {
+    alignSelf: 'center',
+    marginTop: 20,
+    marginBottom: 40,
+    width: '50%',
+    alignItems: 'center',
+  },
+});
diff --git a/src/services/notifications.ts b/src/services/notifications.ts
new file mode 100644
index 0000000..7f58a04
--- /dev/null
+++ b/src/services/notifications.ts
@@ -0,0 +1,27 @@
+import * as SecureStore from 'expo-secure-store';
+import { api } from '../lib/sdkConfig';
+import { NotificationResponse } from '@pharmatech/sdk';
+import { ServiceResponse } from '../types/api';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const NotificationService = {
+  getNotifications: async (): Promise<
+    ServiceResponse<NotificationResponse>
+  > => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      const notifications = await api.notification.getNotifications(token);
+
+      return { success: true, data: notifications };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};

From 4865ea4e7603babfaeafadb5c953218ca13b463b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 18:58:58 -0400
Subject: [PATCH 123/291] Changed Avatar fontSize

---
 src/components/Avatar.tsx | 57 ++++++++++++++++++++++++++++++---------
 1 file changed, 44 insertions(+), 13 deletions(-)

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 5fa90da..2efaad7 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -1,12 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import { Image, View, StyleSheet, ActivityIndicator } from 'react-native';
-import { Colors, FontSizes } from '../styles/theme';
+import { Colors } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
 
 type AvatarProps = {
-  scale?: number;
+  scale?: number; // Propiedad para definir el tamaño del avatar
 };
 
 const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
@@ -23,7 +23,6 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
           'No se encontró el token de autenticación. Usando datos locales.',
         );
 
-        // Data from secureStore
         const userData = await SecureStore.getItemAsync('user_data');
         if (userData) {
           const { firstName, lastName } = JSON.parse(userData);
@@ -56,26 +55,62 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
   }, []);
 
   const getInitials = (fullName: string): string => {
-    console.log('Full Name:', fullName);
     const words = fullName.trim().split(' ');
     if (words.length === 1) return words[0].charAt(0).toUpperCase();
     return (words[0].charAt(0) + words[1].charAt(0)).toUpperCase();
   };
 
+  // Cálculo dinámico de tamaño y fuentes
+  const avatarSize = scale;
+  const fontSize = avatarSize / 2.5;
+  const lineHeight = fontSize + 1;
+  const marginTop = avatarSize / 10;
+
   if (loading) {
     return (
-      <View style={[styles.avatarContainer, styles.loadingContainer]}>
+      <View
+        style={[
+          styles.avatarContainer,
+          styles.loadingContainer,
+          {
+            width: avatarSize,
+            height: avatarSize,
+            borderRadius: avatarSize / 2,
+          },
+        ]}
+      >
         <ActivityIndicator color={Colors.textWhite} />
       </View>
     );
   }
 
   return (
-    <View style={[styles.avatar, { width: scale, height: scale }]}>
+    <View
+      style={[
+        styles.avatar,
+        { width: avatarSize, height: avatarSize, borderRadius: avatarSize / 2 },
+      ]}
+    >
       {profile.uri ? (
-        <Image source={{ uri: profile.uri }} style={styles.avatarImage} />
+        <Image
+          source={{ uri: profile.uri }}
+          style={[
+            styles.avatarImage,
+            { width: avatarSize, height: avatarSize },
+          ]}
+        />
       ) : (
-        <PoppinsText style={styles.initials} weight="semibold">
+        <PoppinsText
+          style={[
+            styles.initials,
+            {
+              fontSize: fontSize,
+              lineHeight: lineHeight,
+              marginTop: marginTop,
+            },
+          ]}
+          weight="semibold"
+        >
           {profile.name ? getInitials(profile.name) : ''}
         </PoppinsText>
       )}
@@ -85,21 +120,17 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
 
 const styles = StyleSheet.create({
   avatar: {
-    borderRadius: 100,
     backgroundColor: Colors.primary,
     alignItems: 'center',
     justifyContent: 'center',
     overflow: 'hidden',
   },
   avatarImage: {
-    width: 32,
-    height: 32,
     resizeMode: 'cover',
   },
   initials: {
-    fontSize: FontSizes.label.size,
-    lineHeight: FontSizes.label.lineHeight,
     color: Colors.textWhite,
+    textAlign: 'center',
   },
   avatarContainer: {
     backgroundColor: Colors.primary,

From 9789c0d6ff2444d670c456fe9db9beb9421cafc0 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 19 Apr 2025 19:21:56 -0400
Subject: [PATCH 124/291] Refactor branch selection and modal integration in
 CheckoutScreen; update LocationSelector to manage selected branch state and
 enhance BranchMapModal functionality.

---
 src/components/BranchMapModal.tsx   | 14 ++----
 src/components/LocationSelector.tsx | 11 +++--
 src/screens/CheckoutScreen.tsx      | 66 +++++++++++++++++++++++++----
 src/types/api.d.ts                  |  1 +
 4 files changed, 70 insertions(+), 22 deletions(-)

diff --git a/src/components/BranchMapModal.tsx b/src/components/BranchMapModal.tsx
index f60c712..9d15c5d 100644
--- a/src/components/BranchMapModal.tsx
+++ b/src/components/BranchMapModal.tsx
@@ -45,16 +45,10 @@ const BranchMapModal = ({
             )}
           </View>
 
-          {branchName ? (
-            <View style={styles.branchInfo}>
-              <MapPinIcon size={18} color={Colors.textMain} />
-              <PoppinsText style={styles.branchName}>{branchName}</PoppinsText>
-            </View>
-          ) : (
-            <PoppinsText style={styles.branchName}>
-              Seleccione una sucursal para ver su ubicación.
-            </PoppinsText>
-          )}
+          <View style={styles.branchInfo}>
+            <MapPinIcon size={18} color={Colors.textMain} />
+            <PoppinsText style={styles.branchName}>{branchName}</PoppinsText>
+          </View>
         </View>
       </View>
     </Modal>
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index be3c8c8..c02c4f0 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -20,9 +20,11 @@ type Branch = {
 const LocationSelector = ({
   selectedOption,
   onSelect,
+  setSelectedBranch,
 }: {
   selectedOption: 'pickup' | 'delivery' | null;
   onSelect: (value: string | null) => void;
+  setSelectedBranch: (branch: Branch | null) => void; // Prop type
 }) => {
   const router = useRouter();
   const [pickupBranches, setPickupBranches] = useState<Branch[]>([]);
@@ -31,13 +33,15 @@ const LocationSelector = ({
   >([]); // Store both UUID and address
   const [dropdownKey, setDropdownKey] = useState(0);
   const [modalVisible, setModalVisible] = useState(false);
-  const [selectedBranch, setSelectedBranch] = useState<Branch | null>(null);
+  const [selectedBranch, setSelectedBranchState] = useState<Branch | null>(
+    null,
+  );
 
   useEffect(() => {
     const resetState = async () => {
       setDropdownKey((prev) => prev + 1);
       onSelect(null);
-      setSelectedBranch(null);
+      setSelectedBranchState(null);
 
       if (selectedOption === 'pickup') {
         try {
@@ -97,7 +101,8 @@ const LocationSelector = ({
         onSelect={(val) => {
           if (selectedOption === 'pickup') {
             const branch = pickupBranches.find((b) => b.name === val);
-            setSelectedBranch(branch || null);
+            setSelectedBranch(branch || null); // Update branch in parent
+            setSelectedBranchState(branch || null);
             onSelect(branch ? branch.id : null);
           } else {
             const selectedAddress = deliveryAddresses.find(
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index da6f815..4b21ade 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -20,7 +20,8 @@ import Coupon from '../components/Coupon';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
-import { OrderType } from '../types/api.d';
+import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
+import BranchMapModal from '../components/BranchMapModal';
 
 const CheckoutScreen = () => {
   const router = useRouter();
@@ -39,6 +40,12 @@ const CheckoutScreen = () => {
   const [isCouponApplied, setIsCouponApplied] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [userName, setUserName] = useState<string | null>('Usuario');
+  const [modalVisible, setModalVisible] = useState(false);
+  const [selectedBranch, setSelectedBranch] = useState<{
+    name: string;
+    latitude: number;
+    longitude: number;
+  } | null>(null);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -116,7 +123,23 @@ const CheckoutScreen = () => {
 
           setErrorMessage(null);
 
-          const orderPayload = {
+          const products: CreateOrderDetail[] = cartItems
+            .filter((item) => item.quantity > 0) // Filtrar productos con cantidad válida
+            .map((item) => ({
+              productPresentationId: item.id, // Asegúrate de que `id` sea el identificador correcto
+              quantity: item.quantity, // Usar la cantidad directamente
+            }));
+
+          if (products.length === 0) {
+            console.error('No hay productos válidos para procesar el pedido.'); // Depuración
+            setErrorMessage('No hay productos válidos en el carrito.');
+            setStatus('rejected');
+            return;
+          }
+
+          console.log('Productos enviados al backend:', products); // Depuración
+
+          const orderPayload: CreateOrder = {
             type:
               selectedOption === 'pickup'
                 ? OrderType.PICKUP
@@ -129,14 +152,15 @@ const CheckoutScreen = () => {
               selectedOption === 'delivery'
                 ? selectedLocation || undefined
                 : undefined,
-            products: cartItems.map((item) => ({
-              productPresentationId: item.id,
-              quantity: Math.max(1, item.quantity),
-            })),
+            products,
           };
 
+          console.log('Payload enviado al backend:', orderPayload); // Depuración
+
           const orderResponse = await OrderService.create(orderPayload);
 
+          console.log('Respuesta del backend:', orderResponse); // Depuración
+
           if (!orderResponse.success || !orderResponse.data?.id) {
             setErrorMessage(
               'No pudimos procesar tu orden. Inténtalo nuevamente.',
@@ -148,7 +172,8 @@ const CheckoutScreen = () => {
 
           setStatus('approved');
           setCurrentStep(stepsLabels.length);
-        } catch {
+        } catch (error) {
+          console.error('Error al procesar la orden:', error); // Depuración
           setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
           setStatus('rejected');
         }
@@ -171,6 +196,14 @@ const CheckoutScreen = () => {
     });
   };
 
+  const handleOpenMapModal = () => {
+    if (selectedBranch) {
+      setModalVisible(true); // Open the modal only if a branch is selected
+    } else {
+      console.error('No branch selected to display on the map.');
+    }
+  };
+
   const isStep1Complete =
     selectedOption !== null &&
     selectedPayment !== null &&
@@ -195,7 +228,8 @@ const CheckoutScreen = () => {
             llegues sin problemas.
           </PoppinsText>
           <PoppinsText style={styles.sucursalText}>
-            Sucursal de retiro: [Nombre de la sucursal]
+            Sucursal de retiro:{' '}
+            {selectedBranch?.name || '[Nombre de la sucursal]'}
           </PoppinsText>
           <Button
             title="Ver Ubicación en el Mapa"
@@ -203,7 +237,7 @@ const CheckoutScreen = () => {
             style={styles.secondaryButton}
             variant="secondary"
             icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
-            onPress={() => console.log('Ver ubicación en el mapa')}
+            onPress={handleOpenMapModal} // Open the modal
           />
         </>
       );
@@ -301,6 +335,7 @@ const CheckoutScreen = () => {
             <LocationSelector
               selectedOption={selectedOption}
               onSelect={(val) => setSelectedLocation(val)}
+              setSelectedBranch={setSelectedBranch}
             />
             <View style={styles.paymentMethods}>
               <PaymentMethods
@@ -415,6 +450,19 @@ const CheckoutScreen = () => {
             }
           />
         </View>
+        <BranchMapModal
+          visible={modalVisible}
+          onClose={() => setModalVisible(false)}
+          branchName={selectedBranch?.name || null}
+          branchCoordinates={
+            selectedBranch
+              ? {
+                  latitude: selectedBranch.latitude,
+                  longitude: selectedBranch.longitude,
+                }
+              : null
+          }
+        />
       </View>
     </ScrollView>
   );
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index d79b3ba..f351b4e 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -184,6 +184,7 @@ export interface CreateOrderDetail {
 export interface CreateOrder {
   type: OrderType;
   branchId?: string;
+  userAddressId?: string;
   products: {
     productPresentationId: string;
     quantity: number;

From d69e856aa6464764b639339cbd3512020b98b72b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 20:21:08 -0400
Subject: [PATCH 125/291] Added categories service

---
 src/screens/tab/CategoriesScreen.tsx | 14 +++++++++++++-
 src/services/category.ts             | 25 +++++++++++++++++++++++++
 2 files changed, 38 insertions(+), 1 deletion(-)
 create mode 100644 src/services/category.ts

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index cd7467f..e80332d 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -1,9 +1,21 @@
-import React from 'react';
+import React, { useEffect } from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
+import { CategoryService } from '../../services/category';
 
 export default function CategoriesScreen() {
+  useEffect(() => {
+    const fetchCategories = async () => {
+      const categories = await CategoryService.getCategories(1, 100);
+      if (categories.success) {
+        console.log(categories.data);
+      }
+    };
+
+    fetchCategories();
+  }, []);
+
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Categorías</PoppinsText>
diff --git a/src/services/category.ts b/src/services/category.ts
new file mode 100644
index 0000000..b1fac12
--- /dev/null
+++ b/src/services/category.ts
@@ -0,0 +1,25 @@
+import { Pagination, CategoryResponse } from '@pharmatech/sdk';
+import { api } from '../lib/sdkConfig';
+import { ServiceResponse } from '../types/api.d';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const CategoryService = {
+  getCategories: async (
+    page: number,
+    limit: number,
+  ): Promise<ServiceResponse<Pagination<CategoryResponse>>> => {
+    try {
+      const categories = await api.category.findAll({
+        page: page,
+        limit: limit,
+      });
+
+      return { success: true, data: categories };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+};

From 3a818aa843cca26346af1db51752ddcd905e2520 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 23:06:48 -0400
Subject: [PATCH 126/291] Handle upload image to cloudinary

---
 package-lock.json             | 16536 ++++++++++++++++++++++----------
 package.json                  |     5 +-
 src/screens/ProfileScreen.tsx |    18 +-
 src/services/images.ts        |    41 +
 4 files changed, 11307 insertions(+), 5293 deletions(-)
 create mode 100644 src/services/images.ts

diff --git a/package-lock.json b/package-lock.json
index ea0c4f3..960321e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -11,6 +11,7 @@
         "@expo-google-fonts/poppins": "^0.2.3",
         "@pharmatech/sdk": "^0.4.3",
         "@reduxjs/toolkit": "^2.6.1",
+        "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
         "expo-constants": "~17.0.7",
@@ -243,6 +244,18 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
+    "node_modules/@babel/helper-environment-visitor": {
+      "version": "7.24.7",
+      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
+      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
+      "peer": true,
+      "dependencies": {
+        "@babel/types": "^7.24.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      }
+    },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
@@ -561,6 +574,25 @@
         "@babel/core": "^7.0.0"
       }
     },
+    "node_modules/@babel/plugin-proposal-async-generator-functions": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
+      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-environment-visitor": "^7.18.9",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/helper-remap-async-to-generator": "^7.18.9",
+        "@babel/plugin-syntax-async-generators": "^7.8.4"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
@@ -623,6 +655,43 @@
         "@babel/core": "^7.0.0-0"
       }
     },
+    "node_modules/@babel/plugin-proposal-object-rest-spread": {
+      "version": "7.20.7",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
+      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
+      "peer": true,
+      "dependencies": {
+        "@babel/compat-data": "^7.20.5",
+        "@babel/helper-compilation-targets": "^7.20.7",
+        "@babel/helper-plugin-utils": "^7.20.2",
+        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
+        "@babel/plugin-transform-parameters": "^7.20.7"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
+    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
+      "version": "7.18.6",
+      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
+      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
+      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
+      "peer": true,
+      "dependencies": {
+        "@babel/helper-plugin-utils": "^7.18.6",
+        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
+      },
+      "engines": {
+        "node": ">=6.9.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0-0"
+      }
+    },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
@@ -2096,6 +2165,22 @@
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
+    "node_modules/@cloudinary/transformation-builder-sdk": {
+      "version": "1.16.1",
+      "resolved": "https://registry.npmjs.org/@cloudinary/transformation-builder-sdk/-/transformation-builder-sdk-1.16.1.tgz",
+      "integrity": "sha512-Mh1qYMkoDxSAzbt0qY9NJaZrdH/vFBcrpeVWmbTXbPVDZHLaaLyJ2+RDFGger5lycbrehPLoNp2hh22BvhkvbQ==",
+      "dependencies": {
+        "@cloudinary/url-gen": "^1.7.0"
+      }
+    },
+    "node_modules/@cloudinary/url-gen": {
+      "version": "1.21.0",
+      "resolved": "https://registry.npmjs.org/@cloudinary/url-gen/-/url-gen-1.21.0.tgz",
+      "integrity": "sha512-ctYcCzX3G3vcgnESTU2ET3K1XsBiXcEnBddCGV0QbR3fJhLLrIShjSMEwZoepgh4LAFOHJu9DzvLFr+E8R7c7g==",
+      "dependencies": {
+        "@cloudinary/transformation-builder-sdk": "^1.15.1"
+      }
+    },
     "node_modules/@egjs/hammerjs": {
       "version": "2.0.17",
       "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz",
@@ -2492,69 +2577,113 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/devcert": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz",
-      "integrity": "sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==",
+    "node_modules/@expo/dev-server": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.3.0.tgz",
+      "integrity": "sha512-2A6/8uZADSKAtzyR6YqhCBUFxb5DFmjxmFn0EHMqnPnsh13ZSiKEjrZPrRkM6Li2EHLYqHK2rmweJ7O/7q9pPQ==",
+      "peer": true,
       "dependencies": {
-        "application-config-path": "^0.1.0",
-        "command-exists": "^1.2.4",
-        "debug": "^3.1.0",
-        "eol": "^0.9.1",
-        "get-port": "^3.2.0",
-        "glob": "^10.4.2",
-        "lodash": "^4.17.21",
-        "mkdirp": "^0.5.1",
-        "password-prompt": "^1.0.4",
-        "sudo-prompt": "^8.2.0",
-        "tmp": "^0.0.33",
-        "tslib": "^2.4.0"
+        "@expo/bunyan": "4.0.0",
+        "@expo/metro-config": "~0.7.0",
+        "@expo/osascript": "2.0.33",
+        "@expo/spawn-async": "^1.5.0",
+        "body-parser": "^1.20.1",
+        "chalk": "^4.0.0",
+        "connect": "^3.7.0",
+        "fs-extra": "9.0.0",
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1",
+        "node-fetch": "^2.6.0",
+        "open": "^8.3.0",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "serialize-error": "6.0.0",
+        "temp-dir": "^2.0.0"
       }
     },
-    "node_modules/@expo/devcert/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+    "node_modules/@expo/dev-server/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+      "peer": true,
       "dependencies": {
-        "ms": "^2.1.1"
+        "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/@expo/env": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.4.2.tgz",
-      "integrity": "sha512-TgbCgvSk0Kq0e2fLoqHwEBL4M0ztFjnBEz0YCDm5boc1nvkV1VMuIMteVdeBwnTh8Z0oPJTwHCD49vhMEt1I6A==",
+    "node_modules/@expo/dev-server/node_modules/@expo/bunyan": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.0.tgz",
+      "integrity": "sha512-Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==",
+      "engines": [
+        "node >=0.10.0"
+      ],
+      "peer": true,
       "dependencies": {
-        "chalk": "^4.0.0",
-        "debug": "^4.3.4",
-        "dotenv": "~16.4.5",
-        "dotenv-expand": "~11.0.6",
-        "getenv": "^1.0.0"
+        "uuid": "^8.0.0"
+      },
+      "optionalDependencies": {
+        "mv": "~2",
+        "safe-json-stringify": "~1"
       }
     },
-    "node_modules/@expo/fingerprint": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.11.11.tgz",
-      "integrity": "sha512-gNyn1KnAOpEa8gSNsYqXMTcq0fSwqU/vit6fP5863vLSKxHm/dNt/gm/uZJxrRZxKq71KUJWF6I7d3z8qIfq5g==",
+    "node_modules/@expo/dev-server/node_modules/@expo/config": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.0.5.tgz",
+      "integrity": "sha512-3CnLmtAQUWqLZwTRliS23QoFwdyhg4AWtp6gZ0qfcXthR84RvlZKcCDQQIyPiRUgu8dZa+gQDcdRJtgE+GM5XQ==",
+      "peer": true,
       "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "arg": "^5.0.2",
+        "@babel/code-frame": "~7.10.4",
+        "@expo/config-plugins": "~6.0.0",
+        "@expo/config-types": "^48.0.0",
+        "@expo/json-file": "^8.2.37",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "require-from-string": "^2.0.2",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "slugify": "^1.3.4",
+        "sucrase": "^3.20.0"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
+      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
+      "peer": true,
+      "dependencies": {
+        "@expo/config-types": "^48.0.0",
+        "@expo/json-file": "~8.2.37",
+        "@expo/plist": "^0.0.20",
+        "@expo/sdk-runtime-versions": "^1.0.0",
+        "@react-native/normalize-color": "^2.0.0",
         "chalk": "^4.1.2",
-        "debug": "^4.3.4",
-        "find-up": "^5.0.0",
+        "debug": "^4.3.1",
+        "find-up": "~5.0.0",
         "getenv": "^1.0.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^3.1.0",
+        "glob": "7.1.6",
         "resolve-from": "^5.0.0",
-        "semver": "^7.6.0"
-      },
-      "bin": {
-        "fingerprint": "bin/cli.js"
+        "semver": "^7.3.5",
+        "slash": "^3.0.0",
+        "xcode": "^3.0.1",
+        "xml2js": "0.4.23"
       }
     },
-    "node_modules/@expo/fingerprint/node_modules/semver": {
+    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins/node_modules/@expo/json-file": {
+      "version": "8.2.37",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
+      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
       "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2562,27 +2691,67 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/image-utils": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.6.5.tgz",
-      "integrity": "sha512-RsS/1CwJYzccvlprYktD42KjyfWZECH6PPIEowvoSmXfGLfdViwcUEI4RvBfKX5Jli6P67H+6YmHvPTbGOboew==",
+    "node_modules/@expo/dev-server/node_modules/@expo/config-types": {
+      "version": "48.0.0",
+      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
+      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A==",
+      "peer": true
+    },
+    "node_modules/@expo/dev-server/node_modules/@expo/json-file": {
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.3.3.tgz",
+      "integrity": "sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A==",
+      "peer": true,
       "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "chalk": "^4.0.0",
-        "fs-extra": "9.0.0",
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/@expo/metro-config": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.7.1.tgz",
+      "integrity": "sha512-vGWU62Zp5pRGw5IEHDNdqvsy62/hu/Na7bswePYVjoaItOjJY7+qilFeF0AAK+3V8qAM8fpltH3ByylKfWaA7A==",
+      "peer": true,
+      "dependencies": {
+        "@expo/config": "~8.0.0",
+        "chalk": "^4.1.0",
+        "debug": "^4.3.2",
+        "find-yarn-workspace-root": "~2.0.0",
         "getenv": "^1.0.0",
-        "jimp-compact": "0.16.1",
-        "parse-png": "^2.1.0",
         "resolve-from": "^5.0.0",
-        "semver": "^7.6.0",
-        "temp-dir": "~2.0.0",
-        "unique-string": "~2.0.0"
+        "sucrase": "^3.20.0"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/fs-extra": {
+    "node_modules/@expo/dev-server/node_modules/@expo/osascript": {
+      "version": "2.0.33",
+      "resolved": "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.33.tgz",
+      "integrity": "sha512-FQinlwHrTlJbntp8a7NAlCKedVXe06Va/0DSLXRO8lZVtgbEMrYYSUZWQNcOlNtc58c2elNph6z9dMOYwSo3JQ==",
+      "peer": true,
+      "dependencies": {
+        "@expo/spawn-async": "^1.5.0",
+        "exec-async": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/@expo/plist": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
+      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
+      "peer": true,
+      "dependencies": {
+        "@xmldom/xmldom": "~0.7.7",
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^14.0.0"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/fs-extra": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
       "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+      "peer": true,
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -2593,10 +2762,32 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/jsonfile": {
+    "node_modules/@expo/dev-server/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "peer": true,
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "peer": true,
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -2604,18 +2795,37 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/jsonfile/node_modules/universalify": {
+    "node_modules/@expo/dev-server/node_modules/jsonfile/node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+    "node_modules/@expo/dev-server/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "peer": true,
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2623,28 +2833,217 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/image-utils/node_modules/universalify": {
+    "node_modules/@expo/dev-server/node_modules/serialize-error": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-6.0.0.tgz",
+      "integrity": "sha512-3vmBkMZLQO+BR4RPHcyRGdE09XCF6cvxzk2N2qn8Er3F91cy8Qt7VvEbZBOpaL53qsBbe2cFOefU6tRY6WDelA==",
+      "peer": true,
+      "dependencies": {
+        "type-fest": "^0.12.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/type-fest": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz",
+      "integrity": "sha512-53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==",
+      "peer": true,
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/@expo/dev-server/node_modules/universalify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
       "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@expo/json-file": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-9.0.2.tgz",
-      "integrity": "sha512-yAznIUrybOIWp3Uax7yRflB0xsEpvIwIEqIjao9SGi2Gaa+N0OamWfe0fnXBSWF+2zzF4VvqwT4W5zwelchfgw==",
+    "node_modules/@expo/dev-server/node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "peer": true,
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.3",
-        "write-file-atomic": "^2.3.0"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
+      },
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/@expo/json-file/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
+    "node_modules/@expo/dev-server/node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "peer": true,
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/@expo/devcert": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz",
+      "integrity": "sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==",
+      "dependencies": {
+        "application-config-path": "^0.1.0",
+        "command-exists": "^1.2.4",
+        "debug": "^3.1.0",
+        "eol": "^0.9.1",
+        "get-port": "^3.2.0",
+        "glob": "^10.4.2",
+        "lodash": "^4.17.21",
+        "mkdirp": "^0.5.1",
+        "password-prompt": "^1.0.4",
+        "sudo-prompt": "^8.2.0",
+        "tmp": "^0.0.33",
+        "tslib": "^2.4.0"
+      }
+    },
+    "node_modules/@expo/devcert/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
+      "dependencies": {
+        "ms": "^2.1.1"
+      }
+    },
+    "node_modules/@expo/env": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.4.2.tgz",
+      "integrity": "sha512-TgbCgvSk0Kq0e2fLoqHwEBL4M0ztFjnBEz0YCDm5boc1nvkV1VMuIMteVdeBwnTh8Z0oPJTwHCD49vhMEt1I6A==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "debug": "^4.3.4",
+        "dotenv": "~16.4.5",
+        "dotenv-expand": "~11.0.6",
+        "getenv": "^1.0.0"
+      }
+    },
+    "node_modules/@expo/fingerprint": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.11.11.tgz",
+      "integrity": "sha512-gNyn1KnAOpEa8gSNsYqXMTcq0fSwqU/vit6fP5863vLSKxHm/dNt/gm/uZJxrRZxKq71KUJWF6I7d3z8qIfq5g==",
+      "dependencies": {
+        "@expo/spawn-async": "^1.7.2",
+        "arg": "^5.0.2",
+        "chalk": "^4.1.2",
+        "debug": "^4.3.4",
+        "find-up": "^5.0.0",
+        "getenv": "^1.0.0",
+        "minimatch": "^3.0.4",
+        "p-limit": "^3.1.0",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.6.0"
+      },
+      "bin": {
+        "fingerprint": "bin/cli.js"
+      }
+    },
+    "node_modules/@expo/fingerprint/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/image-utils": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.6.5.tgz",
+      "integrity": "sha512-RsS/1CwJYzccvlprYktD42KjyfWZECH6PPIEowvoSmXfGLfdViwcUEI4RvBfKX5Jli6P67H+6YmHvPTbGOboew==",
+      "dependencies": {
+        "@expo/spawn-async": "^1.7.2",
+        "chalk": "^4.0.0",
+        "fs-extra": "9.0.0",
+        "getenv": "^1.0.0",
+        "jimp-compact": "0.16.1",
+        "parse-png": "^2.1.0",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.6.0",
+        "temp-dir": "~2.0.0",
+        "unique-string": "~2.0.0"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/fs-extra": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/jsonfile/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@expo/image-utils/node_modules/universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "engines": {
+        "node": ">= 10.0.0"
+      }
+    },
+    "node_modules/@expo/json-file": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-9.0.2.tgz",
+      "integrity": "sha512-yAznIUrybOIWp3Uax7yRflB0xsEpvIwIEqIjao9SGi2Gaa+N0OamWfe0fnXBSWF+2zzF4VvqwT4W5zwelchfgw==",
+      "dependencies": {
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.3",
+        "write-file-atomic": "^2.3.0"
+      }
+    },
+    "node_modules/@expo/json-file/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dependencies": {
         "@babel/highlight": "^7.10.4"
       }
@@ -2920,6 +3319,12 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
+    "node_modules/@gar/promisify": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
+      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
+      "peer": true
+    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -3523,6 +3928,11 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
+    "node_modules/@leichtgewicht/ip-codec": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
+      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
+    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3586,6 +3996,32 @@
         "node": ">=10"
       }
     },
+    "node_modules/@npmcli/move-file": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
+      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
+      "deprecated": "This functionality has been moved to @npmcli/fs",
+      "peer": true,
+      "dependencies": {
+        "mkdirp": "^1.0.4",
+        "rimraf": "^3.0.2"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "peer": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
     "node_modules/@pharmatech/sdk": {
       "version": "0.4.3",
       "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
@@ -3952,6 +4388,12 @@
         "@babel/core": "*"
       }
     },
+    "node_modules/@react-native/normalize-color": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.1.0.tgz",
+      "integrity": "sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA==",
+      "peer": true
+    },
     "node_modules/@react-native/normalize-colors": {
       "version": "0.76.7",
       "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.76.7.tgz",
@@ -4620,11 +5062,19 @@
         "node": ">= 10"
       }
     },
+    "node_modules/@tradle/react-native-http": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/@tradle/react-native-http/-/react-native-http-2.0.1.tgz",
+      "integrity": "sha512-pBLa/mlkD5HE4e8ndF6l8gj4ZUVYlrpRbrODeuxL0+ZFJ0TmBvQ9+bUNy8gNdWTS6kik2fW+u7eiYMeGaISkrA==",
+      "dependencies": {
+        "Base64": "~0.2.0",
+        "inherits": "~2.0.1"
+      }
+    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
-      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10.13.0"
@@ -4667,11 +5117,44 @@
         "@babel/types": "^7.20.7"
       }
     },
+    "node_modules/@types/body-parser": {
+      "version": "1.19.5",
+      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
+      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
+      "dependencies": {
+        "@types/connect": "*",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/bonjour": {
+      "version": "3.5.13",
+      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
+      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect": {
+      "version": "3.4.38",
+      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
+      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/connect-history-api-fallback": {
+      "version": "1.5.4",
+      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
+      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
+      "dependencies": {
+        "@types/express-serve-static-core": "*",
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
-      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -4681,7 +5164,6 @@
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
-      "peer": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -4692,12 +5174,54 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
+    "node_modules/@types/express": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
+      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
+      "dependencies": {
+        "@types/body-parser": "*",
+        "@types/express-serve-static-core": "^4.17.33",
+        "@types/qs": "*",
+        "@types/serve-static": "*"
+      }
+    },
+    "node_modules/@types/express-serve-static-core": {
+      "version": "5.0.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
+      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
+      "version": "4.19.6",
+      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
+      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
+      "dependencies": {
+        "@types/node": "*",
+        "@types/qs": "*",
+        "@types/range-parser": "*",
+        "@types/send": "*"
+      }
+    },
     "node_modules/@types/geojson": {
       "version": "7946.0.16",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
       "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
       "license": "MIT"
     },
+    "node_modules/@types/glob": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
+      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
+      "dependencies": {
+        "@types/minimatch": "*",
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -4713,6 +5237,24 @@
       "dev": true,
       "license": "MIT"
     },
+    "node_modules/@types/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
+    },
+    "node_modules/@types/http-errors": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
+      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
+    },
+    "node_modules/@types/http-proxy": {
+      "version": "1.17.16",
+      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
+      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -4759,6 +5301,16 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
+    "node_modules/@types/mime": {
+      "version": "1.3.5",
+      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
+      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
+    },
+    "node_modules/@types/minimatch": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
+      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
+    },
     "node_modules/@types/node": {
       "version": "22.13.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
@@ -4781,6 +5333,16 @@
       "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
       "devOptional": true
     },
+    "node_modules/@types/qs": {
+      "version": "6.9.18",
+      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
+      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA=="
+    },
+    "node_modules/@types/range-parser": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
+      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
+    },
     "node_modules/@types/react": {
       "version": "18.3.18",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
@@ -4791,22 +5353,70 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
-    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
+    "node_modules/@types/retry": {
+      "version": "0.12.0",
+      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
+      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
     },
-    "node_modules/@types/use-sync-external-store": {
+    "node_modules/@types/send": {
+      "version": "0.17.4",
+      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
+      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
+      "dependencies": {
+        "@types/mime": "^1",
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/serve-index": {
+      "version": "1.9.4",
+      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
+      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
+      "dependencies": {
+        "@types/express": "*"
+      }
+    },
+    "node_modules/@types/serve-static": {
+      "version": "1.15.7",
+      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
+      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
+      "dependencies": {
+        "@types/http-errors": "*",
+        "@types/node": "*",
+        "@types/send": "*"
+      }
+    },
+    "node_modules/@types/sockjs": {
+      "version": "0.3.36",
+      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
+      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
+    },
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
+    },
+    "node_modules/@types/use-sync-external-store": {
       "version": "0.0.6",
       "resolved": "https://registry.npmjs.org/@types/use-sync-external-store/-/use-sync-external-store-0.0.6.tgz",
       "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
       "license": "MIT"
     },
+    "node_modules/@types/ws": {
+      "version": "8.18.1",
+      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
+      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
+      "dependencies": {
+        "@types/node": "*"
+      }
+    },
     "node_modules/@types/yargs": {
       "version": "17.0.33",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
@@ -5053,7 +5663,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
       "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.13.2",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
@@ -5062,26 +5671,22 @@
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
-      "peer": true
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
-      "peer": true
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
-      "peer": true
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
       "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.13.2",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -5091,14 +5696,12 @@
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
-      "peer": true
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
       "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5110,7 +5713,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
       "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
-      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -5119,7 +5721,6 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
       "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
-      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -5127,14 +5728,12 @@
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
-      "peer": true
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
       "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5150,7 +5749,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
       "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
@@ -5163,7 +5761,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
       "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5175,7 +5772,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
       "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -5189,7 +5785,6 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
       "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
-      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
@@ -5207,14 +5802,12 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
-      "peer": true
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
-      "peer": true
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -5233,6 +5826,16 @@
         "node": ">=6.5"
       }
     },
+    "node_modules/abstract-leveldown": {
+      "version": "2.6.1",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.1.tgz",
+      "integrity": "sha512-z3y8+/Y5i90z+viZGYIg7Tu+muVO4qGHAeug7QQ7oQcMaS1RY+3ccwHTISI/vkVAK9r7snv8lMICNdmrYM/LkA==",
+      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
+      "peer": true,
+      "dependencies": {
+        "xtend": "~4.0.0"
+      }
+    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -5323,7 +5926,6 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
-      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5371,6 +5973,14 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
+    "node_modules/ajv-keywords": {
+      "version": "3.5.2",
+      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
+      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
+      "peerDependencies": {
+        "ajv": "^6.9.1"
+      }
+    },
     "node_modules/anser": {
       "version": "1.4.10",
       "resolved": "https://registry.npmjs.org/anser/-/anser-1.4.10.tgz",
@@ -5390,6 +6000,17 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/ansi-html-community": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
+      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
+      "engines": [
+        "node >= 0.8.0"
+      ],
+      "bin": {
+        "ansi-html": "bin/ansi-html"
+      }
+    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -5458,11 +6079,16 @@
         "sprintf-js": "~1.0.2"
       }
     },
+    "node_modules/argsarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
+      "integrity": "sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg==",
+      "peer": true
+    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
       "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "is-array-buffer": "^3.0.5"
@@ -5474,6 +6100,11 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/array-flatten": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
+      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
+    },
     "node_modules/array-includes": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
@@ -5502,6 +6133,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/array-uniq": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
+      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/array.prototype.findlast": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
@@ -5578,7 +6217,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
       "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
-      "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
         "call-bind": "^1.0.8",
@@ -5600,6 +6238,15 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
+    "node_modules/assert": {
+      "version": "1.5.1",
+      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
+      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
+      "dependencies": {
+        "object.assign": "^4.1.4",
+        "util": "^0.10.4"
+      }
+    },
     "node_modules/ast-types": {
       "version": "0.15.2",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
@@ -5615,7 +6262,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
       "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
-      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -5630,6 +6276,19 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
+    "node_modules/asyncstorage-down": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/asyncstorage-down/-/asyncstorage-down-4.2.0.tgz",
+      "integrity": "sha512-xTljBjicpnxsoA7yEs6duXFXWEZC0V1Q/PeKcUM7Cd2k2W1XPGfyBY1kPXBxTqR++u6ZuDa5egnU8/E/WkJv4Q==",
+      "peer": true,
+      "dependencies": {
+        "abstract-leveldown": "2.6.1",
+        "argsarray": "0.0.1",
+        "d64": "^1.0.0",
+        "ltgt": "^2.1.3",
+        "tiny-queue": "0.2.0"
+      }
+    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -5642,7 +6301,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
-      "dev": true,
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -5706,6 +6364,130 @@
         "@babel/core": "^7.8.0"
       }
     },
+    "node_modules/babel-loader": {
+      "version": "8.4.1",
+      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
+      "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
+      "dependencies": {
+        "find-cache-dir": "^3.3.1",
+        "loader-utils": "^2.0.4",
+        "make-dir": "^3.1.0",
+        "schema-utils": "^2.6.5"
+      },
+      "engines": {
+        "node": ">= 8.9"
+      },
+      "peerDependencies": {
+        "@babel/core": "^7.0.0",
+        "webpack": ">=2"
+      }
+    },
+    "node_modules/babel-loader/node_modules/find-cache-dir": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
+      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
+      "dependencies": {
+        "commondir": "^1.0.1",
+        "make-dir": "^3.0.2",
+        "pkg-dir": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
+      }
+    },
+    "node_modules/babel-loader/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-loader/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-loader/node_modules/make-dir": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
+      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
+      "dependencies": {
+        "semver": "^6.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/babel-loader/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/babel-loader/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-loader/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/babel-loader/node_modules/schema-utils": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
+      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
+      "dependencies": {
+        "@types/json-schema": "^7.0.5",
+        "ajv": "^6.12.4",
+        "ajv-keywords": "^3.5.2"
+      },
+      "engines": {
+        "node": ">= 8.9.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      }
+    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -5979,6 +6761,16 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
+    "node_modules/base-64": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
+      "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA=="
+    },
+    "node_modules/Base64": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
+      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw=="
+    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -5998,6 +6790,11 @@
         }
       ]
     },
+    "node_modules/batch": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
+      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
+    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
@@ -6033,6 +6830,14 @@
         "node": ">=0.6"
       }
     },
+    "node_modules/big.js": {
+      "version": "5.2.2",
+      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
+      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -6044,6 +6849,103 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/bl": {
+      "version": "0.8.2",
+      "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz",
+      "integrity": "sha512-pfqikmByp+lifZCS0p6j6KreV6kNU6Apzpm2nKOk+94cZb/jvle55+JxWiByUQ0Wo/+XnDXEy5MxxKMb6r0VIw==",
+      "dependencies": {
+        "readable-stream": "~1.0.26"
+      }
+    },
+    "node_modules/bl/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+    },
+    "node_modules/bl/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/blueimp-md5": {
+      "version": "2.19.0",
+      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
+      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
+      "peer": true
+    },
+    "node_modules/body-parser": {
+      "version": "1.20.3",
+      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
+      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "content-type": "~1.0.5",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "on-finished": "2.4.1",
+        "qs": "6.13.0",
+        "raw-body": "2.5.2",
+        "type-is": "~1.6.18",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
+      }
+    },
+    "node_modules/body-parser/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/body-parser/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/body-parser/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/bonjour-service": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
+      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
+      "dependencies": {
+        "fast-deep-equal": "^3.1.3",
+        "multicast-dns": "^7.2.5"
+      }
+    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -6088,6 +6990,14 @@
         "node": ">=8"
       }
     },
+    "node_modules/browserify-zlib": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
+      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
+      "dependencies": {
+        "pako": "~0.2.0"
+      }
+    },
     "node_modules/browserslist": {
       "version": "4.24.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
@@ -6174,6 +7084,12 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
+    "node_modules/builtins": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
+      "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
+      "peer": true
+    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -6213,7 +7129,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
-      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
@@ -6243,7 +7158,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
       "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
-      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
         "get-intrinsic": "^1.2.6"
@@ -6285,6 +7199,15 @@
         "node": ">=4"
       }
     },
+    "node_modules/camel-case": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
+      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
+      "dependencies": {
+        "pascal-case": "^3.1.2",
+        "tslib": "^2.0.3"
+      }
+    },
     "node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -6301,6 +7224,17 @@
         "node": ">= 6"
       }
     },
+    "node_modules/caniuse-api": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
+      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
+      "dependencies": {
+        "browserslist": "^4.0.0",
+        "caniuse-lite": "^1.0.0",
+        "lodash.memoize": "^4.1.2",
+        "lodash.uniq": "^4.5.0"
+      }
+    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001700",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
@@ -6403,7 +7337,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
-      "peer": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -6451,6 +7384,25 @@
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
       "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q=="
     },
+    "node_modules/clean-css": {
+      "version": "5.3.3",
+      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
+      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
+      "dependencies": {
+        "source-map": "~0.6.0"
+      },
+      "engines": {
+        "node": ">= 10.0"
+      }
+    },
+    "node_modules/clean-css/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -6459,6 +7411,111 @@
         "node": ">=6"
       }
     },
+    "node_modules/clean-webpack-plugin": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
+      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
+      "dependencies": {
+        "del": "^4.1.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "webpack": ">=4.0.0 <6.0.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/array-union": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
+      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
+      "dependencies": {
+        "array-uniq": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/del": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
+      "dependencies": {
+        "@types/glob": "^7.1.1",
+        "globby": "^6.1.0",
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/globby": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
+      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
+      "dependencies": {
+        "array-union": "^1.0.1",
+        "glob": "^7.0.3",
+        "object-assign": "^4.0.1",
+        "pify": "^2.0.0",
+        "pinkie-promise": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/globby/node_modules/pify": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
+      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/p-map": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/clean-webpack-plugin/node_modules/rimraf": {
+      "version": "2.7.1",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
+      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "dependencies": {
+        "glob": "^7.1.3"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
     "node_modules/cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -6550,1381 +7607,1764 @@
         "node": ">=6"
       }
     },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
-      "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+    "node_modules/cloudinary-react-native": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/cloudinary-react-native/-/cloudinary-react-native-1.0.1.tgz",
+      "integrity": "sha512-itywsta5Yy8R4BL82HsyxBS1YDly58nOdQFo5ZVZtnWi7gzwxNw2Ts+07RWPa1qdW4CzK0vCqTDELuaERmzvUA==",
+      "dependencies": {
+        "@cloudinary/url-gen": "^1.10.0",
+        "@expo/webpack-config": "^18.0.1",
+        "@tradle/react-native-http": "^2.0.1",
+        "assert": "^1.5.0",
+        "browserify-zlib": "^0.1.4",
+        "console-browserify": "^1.2.0",
+        "constants-browserify": "^1.0.0",
+        "dns.js": "^1.0.1",
+        "domain-browser": "^1.2.0",
+        "events": "^1.1.1",
+        "expo-asset": "^10.0.6",
+        "expo-av": "^14.0.5",
+        "expo-crypto": "^13.0.2",
+        "https-browserify": "^0.0.1",
+        "isomorphic-fetch": "^3.0.0",
+        "path-browserify": "^0.0.0",
+        "process": "^0.11.10",
+        "punycode": "^1.4.1",
+        "querystring-es3": "^0.2.1",
+        "react-dom": "18.0.0",
+        "react-native-fs": "^2.20.0",
+        "react-native-level-fs": "^3.0.1",
+        "react-native-os": "^1.2.6",
+        "react-native-tcp": "^3.3.2",
+        "react-native-udp": "^2.7.0",
+        "react-native-url-polyfill": "^1.3.0",
+        "react-native-web": "~0.19.6",
+        "readable-stream": "^1.0.33",
+        "stream-browserify": "^1.0.0",
+        "string_decoder": "^0.10.31",
+        "timers-browserify": "^1.4.2",
+        "tty-browserify": "^0.0.0",
+        "url": "^0.10.3",
+        "util": "^0.10.4",
+        "vm-browserify": "^0.0.4"
+      },
+      "engines": {
+        "node": ">= 22.0.0"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
-    },
-    "node_modules/color": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-      "license": "MIT",
+    "node_modules/cloudinary-react-native/node_modules/@babel/code-frame": {
+      "version": "7.10.4",
+      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
+      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
       "dependencies": {
-        "color-convert": "^2.0.1",
-        "color-string": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=12.5.0"
+        "@babel/highlight": "^7.10.4"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/cli": {
+      "version": "0.7.3",
+      "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-0.7.3.tgz",
+      "integrity": "sha512-uMGHbAhApqXR2sd1KPhgvpbOhBBnspad8msEqHleT2PHXwKIwTUDzBGO9+jdOAWwCx2MJfw3+asYjzoD3DN9Bg==",
+      "peer": true,
       "dependencies": {
-        "color-name": "~1.1.4"
+        "@babel/runtime": "^7.20.0",
+        "@expo/code-signing-certificates": "0.0.5",
+        "@expo/config": "~8.0.0",
+        "@expo/config-plugins": "~6.0.0",
+        "@expo/dev-server": "0.3.0",
+        "@expo/devcert": "^1.0.0",
+        "@expo/json-file": "^8.2.37",
+        "@expo/metro-config": "~0.7.0",
+        "@expo/osascript": "^2.0.31",
+        "@expo/package-manager": "~1.0.0",
+        "@expo/plist": "^0.0.20",
+        "@expo/prebuild-config": "6.0.1",
+        "@expo/rudder-sdk-node": "1.1.1",
+        "@expo/spawn-async": "1.5.0",
+        "@expo/xcpretty": "^4.2.1",
+        "@urql/core": "2.3.6",
+        "@urql/exchange-retry": "0.3.0",
+        "accepts": "^1.3.8",
+        "arg": "4.1.0",
+        "better-opn": "~3.0.2",
+        "bplist-parser": "^0.3.1",
+        "cacache": "^15.3.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.3.0",
+        "debug": "^4.3.4",
+        "env-editor": "^0.4.1",
+        "form-data": "^3.0.1",
+        "freeport-async": "2.0.0",
+        "fs-extra": "~8.1.0",
+        "getenv": "^1.0.0",
+        "graphql": "15.8.0",
+        "graphql-tag": "^2.10.1",
+        "https-proxy-agent": "^5.0.1",
+        "internal-ip": "4.3.0",
+        "is-root": "^2.1.0",
+        "js-yaml": "^3.13.1",
+        "json-schema-deref-sync": "^0.13.0",
+        "md5-file": "^3.2.3",
+        "md5hex": "^1.0.0",
+        "minipass": "3.1.6",
+        "node-fetch": "^2.6.7",
+        "node-forge": "^1.3.1",
+        "npm-package-arg": "^7.0.0",
+        "ora": "3.4.0",
+        "pretty-bytes": "5.6.0",
+        "progress": "2.0.3",
+        "prompts": "^2.3.2",
+        "qrcode-terminal": "0.11.0",
+        "requireg": "^0.2.2",
+        "resolve-from": "^5.0.0",
+        "semver": "^6.3.0",
+        "send": "^0.18.0",
+        "slugify": "^1.3.4",
+        "structured-headers": "^0.4.1",
+        "tar": "^6.0.5",
+        "tempy": "^0.7.1",
+        "terminal-link": "^2.1.1",
+        "text-table": "^0.2.0",
+        "url-join": "4.0.0",
+        "wrap-ansi": "^7.0.0",
+        "ws": "^8.12.1"
       },
-      "engines": {
-        "node": ">=7.0.0"
+      "bin": {
+        "expo-internal": "build/bin/cli"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    "node_modules/cloudinary-react-native/node_modules/@expo/cli/node_modules/semver": {
+      "version": "6.3.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
+      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      }
     },
-    "node_modules/color-string": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-      "license": "MIT",
+    "node_modules/cloudinary-react-native/node_modules/@expo/config": {
+      "version": "8.0.5",
+      "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.0.5.tgz",
+      "integrity": "sha512-3CnLmtAQUWqLZwTRliS23QoFwdyhg4AWtp6gZ0qfcXthR84RvlZKcCDQQIyPiRUgu8dZa+gQDcdRJtgE+GM5XQ==",
+      "peer": true,
       "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
+        "@babel/code-frame": "~7.10.4",
+        "@expo/config-plugins": "~6.0.0",
+        "@expo/config-types": "^48.0.0",
+        "@expo/json-file": "^8.2.37",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "require-from-string": "^2.0.2",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "slugify": "^1.3.4",
+        "sucrase": "^3.20.0"
       }
     },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/config-plugins": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
+      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
+      "peer": true,
       "dependencies": {
-        "delayed-stream": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
+        "@expo/config-types": "^48.0.0",
+        "@expo/json-file": "~8.2.37",
+        "@expo/plist": "^0.0.20",
+        "@expo/sdk-runtime-versions": "^1.0.0",
+        "@react-native/normalize-color": "^2.0.0",
+        "chalk": "^4.1.2",
+        "debug": "^4.3.1",
+        "find-up": "~5.0.0",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.3.5",
+        "slash": "^3.0.0",
+        "xcode": "^3.0.1",
+        "xml2js": "0.4.23"
       }
     },
-    "node_modules/command-exists": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
-      "engines": {
-        "node": ">= 10"
+    "node_modules/cloudinary-react-native/node_modules/@expo/config-plugins/node_modules/@expo/json-file": {
+      "version": "8.2.37",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
+      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
+      "peer": true,
+      "dependencies": {
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-    },
-    "node_modules/component-type": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
-      "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/cloudinary-react-native/node_modules/@expo/config-types": {
+      "version": "48.0.0",
+      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
+      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A==",
+      "peer": true
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
-      "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+    "node_modules/cloudinary-react-native/node_modules/@expo/config/node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=10"
       }
     },
-    "node_modules/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/env": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.3.0.tgz",
+      "integrity": "sha512-OtB9XVHWaXidLbHvrVDeeXa09yvTl3+IQN884sO6PhIi2/StXfgSH/9zC7IvzrDB8kW3EBJ1PPLuCUJ2hxAT7Q==",
       "dependencies": {
-        "bytes": "3.1.2",
-        "compressible": "~2.0.18",
-        "debug": "2.6.9",
-        "negotiator": "~0.6.4",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.2.1",
-        "vary": "~1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
+        "chalk": "^4.0.0",
+        "debug": "^4.3.4",
+        "dotenv": "~16.4.5",
+        "dotenv-expand": "~11.0.6",
+        "getenv": "^1.0.0"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils": {
+      "version": "0.3.22",
+      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.22.tgz",
+      "integrity": "sha512-uzq+RERAtkWypOFOLssFnXXqEqKjNj9eXN7e97d/EXUAojNcLDoXc0sL+F5B1I4qtlsnhX01kcpoIBBZD8wZNQ==",
+      "peer": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "@expo/spawn-async": "1.5.0",
+        "chalk": "^4.0.0",
+        "fs-extra": "9.0.0",
+        "getenv": "^1.0.0",
+        "jimp-compact": "0.16.1",
+        "mime": "^2.4.4",
+        "node-fetch": "^2.6.0",
+        "parse-png": "^2.1.0",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "tempy": "0.3.0"
       }
     },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/fs-extra": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+      "peer": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "peer": true,
+      "bin": {
+        "mime": "cli.js"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
     },
-    "node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/tempy": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz",
+      "integrity": "sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==",
+      "peer": true,
       "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
+        "temp-dir": "^1.0.0",
+        "type-fest": "^0.3.1",
+        "unique-string": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/json-file": {
+      "version": "8.3.3",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.3.3.tgz",
+      "integrity": "sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A==",
       "dependencies": {
-        "ms": "2.0.0"
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.2",
+        "write-file-atomic": "^2.3.0"
       }
     },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/cloudinary-react-native/node_modules/@expo/metro-config": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.7.1.tgz",
+      "integrity": "sha512-vGWU62Zp5pRGw5IEHDNdqvsy62/hu/Na7bswePYVjoaItOjJY7+qilFeF0AAK+3V8qAM8fpltH3ByylKfWaA7A==",
+      "peer": true,
+      "dependencies": {
+        "@expo/config": "~8.0.0",
+        "chalk": "^4.1.0",
+        "debug": "^4.3.2",
+        "find-yarn-workspace-root": "~2.0.0",
+        "getenv": "^1.0.0",
+        "resolve-from": "^5.0.0",
+        "sucrase": "^3.20.0"
+      }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    "node_modules/cloudinary-react-native/node_modules/@expo/package-manager": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.0.3.tgz",
+      "integrity": "sha512-NpdwcRar22gJDDug3GEb62Ka6vy+Yi//3zTdYhdkzwekY6qzg7+vZCeEKayFJjvbCjjOPNSrauNR4zD+WJmRIQ==",
+      "peer": true,
+      "dependencies": {
+        "@expo/json-file": "^8.2.37",
+        "@expo/spawn-async": "^1.5.0",
+        "ansi-regex": "^5.0.0",
+        "chalk": "^4.0.0",
+        "find-up": "^5.0.0",
+        "find-yarn-workspace-root": "~2.0.0",
+        "js-yaml": "^3.13.1",
+        "micromatch": "^4.0.2",
+        "npm-package-arg": "^7.0.0",
+        "split": "^1.0.1",
+        "sudo-prompt": "9.1.1"
+      }
     },
-    "node_modules/core-js": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
-      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+    "node_modules/cloudinary-react-native/node_modules/@expo/plist": {
+      "version": "0.0.20",
+      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
+      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
+      "peer": true,
+      "dependencies": {
+        "@xmldom/xmldom": "~0.7.7",
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^14.0.0"
       }
     },
-    "node_modules/core-js-compat": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
-      "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.0.1.tgz",
+      "integrity": "sha512-WK3FDht1tdXZGCvtG5s7HSwzhsc7Tyu2DdqV9jVUsLtGD42oqUepk13mEWlU9LOTBgLsoEueKjoSK4EXOXFctw==",
+      "peer": true,
       "dependencies": {
-        "browserslist": "^4.24.3"
+        "@expo/config": "~8.0.0",
+        "@expo/config-plugins": "~6.0.0",
+        "@expo/config-types": "^48.0.0",
+        "@expo/image-utils": "0.3.22",
+        "@expo/json-file": "^8.2.37",
+        "debug": "^4.3.1",
+        "fs-extra": "^9.0.0",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "xml2js": "0.4.23"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+      "peerDependencies": {
+        "expo-modules-autolinking": ">=0.8.1"
       }
     },
-    "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "peer": true,
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
+    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "peer": true,
       "bin": {
-        "create-jest": "bin/create-jest.js"
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
-      "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
-      "dependencies": {
-        "node-fetch": "^2.7.0"
+    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "peer": true,
+      "engines": {
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/spawn-async": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.5.0.tgz",
+      "integrity": "sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==",
+      "peer": true,
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "cross-spawn": "^6.0.5"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
+    "node_modules/cloudinary-react-native/node_modules/@expo/vector-icons": {
+      "version": "13.0.0",
+      "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-13.0.0.tgz",
+      "integrity": "sha512-TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA==",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/@expo/webpack-config": {
+      "version": "18.1.4",
+      "resolved": "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.1.4.tgz",
+      "integrity": "sha512-lc2ZvlsxI6vDH4RHA4xnYzDl4Dir5HTiFpw8WE28kE8+33pma/DIIycv5bE/BZx+czV5NqM4103E2TvgKkccKA==",
+      "dependencies": {
+        "@babel/core": "^7.20.2",
+        "babel-loader": "^8.3.0",
+        "chalk": "^4.0.0",
+        "clean-webpack-plugin": "^4.0.0",
+        "copy-webpack-plugin": "^10.2.0",
+        "css-loader": "^6.5.1",
+        "css-minimizer-webpack-plugin": "^3.4.1",
+        "expo-pwa": "0.0.126",
+        "find-up": "^5.0.0",
+        "find-yarn-workspace-root": "~2.0.0",
+        "getenv": "^1.0.0",
+        "html-webpack-plugin": "^5.5.0",
+        "is-wsl": "^2.0.0",
+        "mini-css-extract-plugin": "^2.5.2",
+        "node-html-parser": "^5.2.0",
+        "semver": "~7.3.2",
+        "source-map-loader": "^3.0.1",
+        "style-loader": "^3.3.1",
+        "terser-webpack-plugin": "^5.3.0",
+        "webpack": "^5.64.4",
+        "webpack-dev-server": "^4.11.1",
+        "webpack-manifest-plugin": "^4.1.1"
+      },
       "engines": {
-        "node": "*"
+        "node": ">=12"
+      },
+      "peerDependencies": {
+        "expo": "^48.0.17"
       }
     },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
+    "node_modules/cloudinary-react-native/node_modules/@jest/types": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
+      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
+      "peer": true,
+      "dependencies": {
+        "@types/istanbul-lib-coverage": "^2.0.0",
+        "@types/istanbul-reports": "^3.0.0",
+        "@types/node": "*",
+        "@types/yargs": "^15.0.0",
+        "chalk": "^4.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 10.14.2"
       }
     },
-    "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
+    "node_modules/cloudinary-react-native/node_modules/@npmcli/fs": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
+      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+      "peer": true,
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "@gar/promisify": "^1.0.1",
+        "semver": "^7.3.5"
       }
     },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+    "node_modules/cloudinary-react-native/node_modules/@types/yargs": {
+      "version": "15.0.19",
+      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
+      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
+      "peer": true,
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "@types/yargs-parser": "*"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/@urql/core": {
+      "version": "2.3.6",
+      "resolved": "https://registry.npmjs.org/@urql/core/-/core-2.3.6.tgz",
+      "integrity": "sha512-PUxhtBh7/8167HJK6WqBv6Z0piuiaZHQGYbhwpNL9aIQmLROPEdaUYkY4wh45wPQXcTpnd11l0q3Pw+TI11pdw==",
+      "peer": true,
+      "dependencies": {
+        "@graphql-typed-document-node/core": "^3.1.0",
+        "wonka": "^4.0.14"
       },
-      "engines": {
-        "node": ">=8.0.0"
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/cloudinary-react-native/node_modules/@urql/core/node_modules/@graphql-typed-document-node/core": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz",
+      "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==",
+      "peer": true,
+      "peerDependencies": {
+        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
       }
     },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "engines": {
-        "node": ">= 6"
+    "node_modules/cloudinary-react-native/node_modules/@urql/exchange-retry": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-0.3.0.tgz",
+      "integrity": "sha512-hHqer2mcdVC0eYnVNbWyi28AlGOPb2vjH3lP3/Bc8Lc8BjhMsDwFMm7WhoP5C1+cfbr/QJ6Er3H/L08wznXxfg==",
+      "peer": true,
+      "dependencies": {
+        "@urql/core": ">=2.3.1",
+        "wonka": "^4.0.14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+      "peerDependencies": {
+        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
       }
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+    "node_modules/cloudinary-react-native/node_modules/arg": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
+      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/babel-plugin-module-resolver": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz",
+      "integrity": "sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==",
+      "peer": true,
+      "dependencies": {
+        "find-babel-config": "^1.2.0",
+        "glob": "^7.1.6",
+        "pkg-up": "^3.1.0",
+        "reselect": "^4.0.0",
+        "resolve": "^1.13.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8.0.0"
       }
     },
-    "node_modules/csso": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/cloudinary-react-native/node_modules/babel-plugin-react-native-web": {
+      "version": "0.18.12",
+      "resolved": "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.12.tgz",
+      "integrity": "sha512-4djr9G6fMdwQoD6LQ7hOKAm39+y12flWgovAqS1k5O8f42YQ3A1FFMyV5kKfetZuGhZO5BmNmOdRRZQ1TixtDw==",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/babel-preset-expo": {
+      "version": "9.3.2",
+      "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-9.3.2.tgz",
+      "integrity": "sha512-BjyvjwjJG0MaaDBLP/esbXRrAItM76po9L9zfnLxeqgFsHCIPmD+6ir45coDLGAXwR8m9It3G1yqYM9JPyemsQ==",
+      "peer": true,
       "dependencies": {
-        "css-tree": "~2.2.0"
+        "@babel/plugin-proposal-decorators": "^7.12.9",
+        "@babel/plugin-proposal-object-rest-spread": "^7.12.13",
+        "@babel/plugin-transform-react-jsx": "^7.12.17",
+        "@babel/preset-env": "^7.20.0",
+        "babel-plugin-module-resolver": "^4.1.0",
+        "babel-plugin-react-native-web": "~0.18.10",
+        "metro-react-native-babel-preset": "0.73.9"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/cacache": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
+      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
+      "peer": true,
+      "dependencies": {
+        "@npmcli/fs": "^1.0.0",
+        "@npmcli/move-file": "^1.0.1",
+        "chownr": "^2.0.0",
+        "fs-minipass": "^2.0.0",
+        "glob": "^7.1.4",
+        "infer-owner": "^1.0.4",
+        "lru-cache": "^6.0.0",
+        "minipass": "^3.1.1",
+        "minipass-collect": "^1.0.2",
+        "minipass-flush": "^1.0.5",
+        "minipass-pipeline": "^1.2.2",
+        "mkdirp": "^1.0.3",
+        "p-map": "^4.0.0",
+        "promise-inflight": "^1.0.1",
+        "rimraf": "^3.0.2",
+        "ssri": "^8.0.1",
+        "tar": "^6.0.2",
+        "unique-filename": "^1.1.1"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/cloudinary-react-native/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+      "peer": true,
       "dependencies": {
-        "mdn-data": "2.0.28",
-        "source-map-js": "^1.0.1"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       },
       "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+        "node": ">=4.8"
       }
     },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
+    "node_modules/cloudinary-react-native/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
+      }
     },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
-      "dependencies": {
-        "cssom": "~0.3.6"
-      },
+    "node_modules/cloudinary-react-native/node_modules/crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
+      "peer": true,
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true
+    "node_modules/cloudinary-react-native/node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
     },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+    "node_modules/cloudinary-react-native/node_modules/expo": {
+      "version": "48.0.21",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-48.0.21.tgz",
+      "integrity": "sha512-Z211SC4wZP4Xd5/RBJhEw4uwSgpfzAvMh6IVdzwEVAJAcV1s48CACcSmIUe+7QJjEPzmb3T5Yo4EJ/JJXJ2o9A==",
+      "peer": true,
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
+        "@babel/runtime": "^7.20.0",
+        "@expo/cli": "0.7.3",
+        "@expo/config": "8.0.5",
+        "@expo/config-plugins": "6.0.2",
+        "@expo/vector-icons": "^13.0.0",
+        "babel-preset-expo": "~9.3.2",
+        "cross-spawn": "^6.0.5",
+        "expo-application": "~5.1.1",
+        "expo-asset": "~8.9.1",
+        "expo-constants": "~14.2.1",
+        "expo-file-system": "~15.2.2",
+        "expo-font": "~11.1.1",
+        "expo-keep-awake": "~12.0.1",
+        "expo-modules-autolinking": "1.2.0",
+        "expo-modules-core": "1.2.7",
+        "fbemitter": "^3.0.0",
+        "getenv": "^1.0.0",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3",
+        "node-fetch": "^2.6.7",
+        "pretty-format": "^26.5.2",
+        "uuid": "^3.4.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "expo": "bin/cli.js"
       }
     },
-    "node_modules/data-urls/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+    "node_modules/cloudinary-react-native/node_modules/expo-asset": {
+      "version": "10.0.10",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-10.0.10.tgz",
+      "integrity": "sha512-0qoTIihB79k+wGus9wy0JMKq7DdenziVx3iUkGvMAy2azscSgWH6bd2gJ9CGnhC6JRd3qTMFBL0ou/fx7WZl7A==",
       "dependencies": {
-        "punycode": "^2.1.1"
+        "expo-constants": "~16.0.0",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3"
       },
-      "engines": {
-        "node": ">=12"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "engines": {
-        "node": ">=12"
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config": {
+      "version": "9.0.4",
+      "resolved": "https://registry.npmjs.org/@expo/config/-/config-9.0.4.tgz",
+      "integrity": "sha512-g5ns5u1JSKudHYhjo1zaSfkJ/iZIcWmUmIQptMJZ6ag1C0ShL2sj8qdfU8MmAMuKLOgcIfSaiWlQnm4X3VJVkg==",
+      "dependencies": {
+        "@babel/code-frame": "~7.10.4",
+        "@expo/config-plugins": "~8.0.8",
+        "@expo/config-types": "^51.0.3",
+        "@expo/json-file": "^8.3.0",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "require-from-string": "^2.0.2",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.6.0",
+        "slugify": "^1.3.4",
+        "sucrase": "3.34.0"
       }
     },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config-plugins": {
+      "version": "8.0.11",
+      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-8.0.11.tgz",
+      "integrity": "sha512-oALE1HwnLFthrobAcC9ocnR9KXLzfWEjgIe4CPe+rDsfC6GDs8dGYCXfRFoCEzoLN4TGYs9RdZ8r0KoCcNrm2A==",
       "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "@expo/config-types": "^51.0.3",
+        "@expo/json-file": "~8.3.0",
+        "@expo/plist": "^0.1.0",
+        "@expo/sdk-runtime-versions": "^1.0.0",
+        "chalk": "^4.1.2",
+        "debug": "^4.3.1",
+        "find-up": "~5.0.0",
+        "getenv": "^1.0.0",
+        "glob": "7.1.6",
+        "resolve-from": "^5.0.0",
+        "semver": "^7.5.4",
+        "slash": "^3.0.0",
+        "slugify": "^1.6.6",
+        "xcode": "^3.0.1",
+        "xml2js": "0.6.0"
       }
     },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config-types": {
+      "version": "51.0.3",
+      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-51.0.3.tgz",
+      "integrity": "sha512-hMfuq++b8VySb+m9uNNrlpbvGxYc8OcFCUX9yTmi9tlx6A4k8SDabWFBgmnr4ao3wEArvWrtUQIfQCVtPRdpKA=="
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/plist": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.1.3.tgz",
+      "integrity": "sha512-GW/7hVlAylYg1tUrEASclw1MMk9FP4ZwyFAY/SUTJIhPDQHtfOlXREyWV3hhrHdX/K+pS73GNgdfT6E/e+kBbg==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "@xmldom/xmldom": "~0.7.7",
+        "base64-js": "^1.2.3",
+        "xmlbuilder": "^14.0.0"
       }
     },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/expo-constants": {
+      "version": "16.0.2",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-16.0.2.tgz",
+      "integrity": "sha512-9tNY3OVO0jfiMzl7ngb6IOyR5VFzNoN5OOazUWoeGfmMqVB5kltTemRvKraK9JRbBKIw+SOYLEmF0sEqgFZ6OQ==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+        "@expo/config": "~9.0.0",
+        "@expo/env": "~0.3.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/inspect-js"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/xml2js": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
+      "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/date-fns": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
+    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "engines": {
+        "node": ">=4.0"
       }
     },
-    "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+    "node_modules/cloudinary-react-native/node_modules/expo-constants": {
+      "version": "14.2.1",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-14.2.1.tgz",
+      "integrity": "sha512-DD5u4QmBds2U7uYo409apV7nX+XjudARcgqe7S9aRFJ/6kyftmuxvk1DpaU4X42Av8z/tfKwEpuxl+vl7HHx/Q==",
+      "peer": true,
       "dependencies": {
-        "ms": "^2.1.3"
+        "@expo/config": "~8.0.0",
+        "uuid": "^3.3.2"
       },
-      "engines": {
-        "node": ">=6.0"
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo-file-system": {
+      "version": "15.2.2",
+      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.2.2.tgz",
+      "integrity": "sha512-LFkOLcWwlmnjkURxZ3/0ukS35OswX8iuQknLHRHeyk8mUA8fpRPPelD/a1lS+yclqfqavMJmTXVKM1Nsq5XVMA==",
+      "peer": true,
+      "dependencies": {
+        "uuid": "^3.4.0"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
-      "license": "MIT",
-      "engines": {
-        "node": ">=0.10"
+    "node_modules/cloudinary-react-native/node_modules/expo-font": {
+      "version": "11.1.1",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-11.1.1.tgz",
+      "integrity": "sha512-X+aICqYY69hiiDDtcNrjq8KutHrH2TrHuMqk0Rfq0P7hF6hMd+YefwLBNkvIrqrgmTAuqiLjMUwj2rHLqmgluw==",
+      "peer": true,
+      "dependencies": {
+        "fontfaceobserver": "^2.1.0"
+      },
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+    "node_modules/cloudinary-react-native/node_modules/expo-keep-awake": {
+      "version": "12.0.1",
+      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.0.1.tgz",
+      "integrity": "sha512-hqeCnb4033TyuZaXs93zTK7rjVJ3bywXATyMmKmKkLEsH2PKBAl/VmjlCOPQL/2Ncqz6aj7Wo//tjeJTARBD4g==",
+      "peer": true,
       "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
+        "expo": "*"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.2.0.tgz",
+      "integrity": "sha512-QOPh/iXykNDCAzUual1imSrn2aDakzCGUp2QmxVREr0llajXygroUWlT9sQXh1zKzbNp+a+i/xK375ZeBFiNJA==",
+      "peer": true,
+      "dependencies": {
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "fast-glob": "^3.2.5",
+        "find-up": "^5.0.0",
+        "fs-extra": "^9.1.0"
       },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
+      "bin": {
+        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+      "peer": true,
+      "dependencies": {
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
-    },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "peer": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+    "node_modules/cloudinary-react-native/node_modules/expo-modules-core": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.2.7.tgz",
+      "integrity": "sha512-sulqn2M8+tIdxi6QFkKppDEzbePAscgE2LEHocYoQOgHxJpeT7axE0Hkzc+81EeviQilZzGeFZMtNMGh3c9yJg==",
+      "peer": true,
       "dependencies": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
+        "compare-versions": "^3.4.0",
+        "invariant": "^2.2.4"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset": {
+      "version": "8.9.2",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-8.9.2.tgz",
+      "integrity": "sha512-aHMaZkIG5/UoguINEHm2ln/KviU2m/yuryslnhCKR3KXRxiLnMhxmrONLGbknuNE0O1iCaprrl1w3y71u01Rpw==",
+      "peer": true,
+      "dependencies": {
+        "blueimp-md5": "^2.10.0",
+        "expo-constants": "~14.3.0",
+        "expo-file-system": "~15.3.0",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3",
+        "path-browserify": "^1.0.0",
+        "url-parse": "^1.5.9"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset/node_modules/expo-constants": {
+      "version": "14.3.0",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-14.3.0.tgz",
+      "integrity": "sha512-O8b+mZlPXZGH4wLLd+jMihGD0ZSMJRSmSsmcG7T60jHU3Dw4yDIuzHM/wMoBoL1pxLIbEwvcwDj0w8c+Sn+1sQ==",
+      "peer": true,
+      "dependencies": {
+        "@expo/config": "~8.0.0",
+        "uuid": "^3.3.2"
       },
-      "engines": {
-        "node": ">=6"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
+    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset/node_modules/expo-file-system": {
+      "version": "15.3.0",
+      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.3.0.tgz",
+      "integrity": "sha512-YUvNZzZJlF5TZM+FoRW9biJPB7qEgZbGYm8xJpqnxpj70FkFhwwoKiXVduZk+KVNiIs7d0q7e+Jdvmcr+Id3FQ==",
+      "peer": true,
       "dependencies": {
-        "clone": "^1.0.2"
+        "uuid": "^3.4.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/path-browserify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
+      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/find-babel-config": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.2.tgz",
+      "integrity": "sha512-oK59njMyw2y3yxto1BCfVK7MQp/OYf4FleHu0RgosH3riFJ1aOuo/7naLDLAObfrgn3ueFhw5sAT/cp0QuJI3Q==",
+      "peer": true,
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
+        "json5": "^1.0.2",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/cloudinary-react-native/node_modules/find-babel-config/node_modules/json5": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
+      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
+      "peer": true,
+      "dependencies": {
+        "minimist": "^1.2.0"
+      },
+      "bin": {
+        "json5": "lib/cli.js"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/fs-minipass": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
+      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
+      "peer": true,
       "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
+        "minipass": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 8"
       }
     },
-    "node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+    "node_modules/cloudinary-react-native/node_modules/glob": {
+      "version": "7.1.6",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
+      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.0.4",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "*"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+    "node_modules/cloudinary-react-native/node_modules/hosted-git-info": {
+      "version": "3.0.8",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
+      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
+      "peer": true,
+      "dependencies": {
+        "lru-cache": "^6.0.0"
+      },
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=10"
       }
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/cloudinary-react-native/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "peer": true,
+      "dependencies": {
+        "universalify": "^2.0.0"
+      },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
+    "node_modules/cloudinary-react-native/node_modules/jsonfile/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+      "peer": true,
       "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
+    "node_modules/cloudinary-react-native/node_modules/lru-cache": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
+      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
+      "dependencies": {
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=10"
       }
     },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+    "node_modules/cloudinary-react-native/node_modules/minipass": {
+      "version": "3.1.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
+      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
+      "peer": true,
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+    "node_modules/cloudinary-react-native/node_modules/minipass-collect": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
+      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
+      "peer": true,
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
-      "dependencies": {
-        "path-type": "^4.0.0"
+    "node_modules/cloudinary-react-native/node_modules/mkdirp": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
+      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
+      "peer": true,
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
-    },
-    "node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/npm-package-arg": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz",
+      "integrity": "sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==",
+      "peer": true,
       "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "hosted-git-info": "^3.0.2",
+        "osenv": "^0.1.5",
+        "semver": "^5.6.0",
+        "validate-npm-package-name": "^3.0.0"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
-      "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+    "node_modules/cloudinary-react-native/node_modules/npm-package-arg/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "peer": true,
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
-    },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
+    "node_modules/cloudinary-react-native/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+      "peer": true,
       "dependencies": {
-        "webidl-conversions": "^7.0.0"
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+    "node_modules/cloudinary-react-native/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "peer": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=4"
       }
     },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+    "node_modules/cloudinary-react-native/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/pretty-format": {
+      "version": "26.6.2",
+      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
+      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
+      "peer": true,
       "dependencies": {
-        "domelementtype": "^2.3.0"
+        "@jest/types": "^26.6.2",
+        "ansi-regex": "^5.0.0",
+        "ansi-styles": "^4.0.0",
+        "react-is": "^17.0.1"
       },
       "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "node": ">= 10"
       }
     },
-    "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+    "node_modules/cloudinary-react-native/node_modules/punycode": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
+      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    },
+    "node_modules/cloudinary-react-native/node_modules/react-dom": {
+      "version": "18.0.0",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.0.0.tgz",
+      "integrity": "sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==",
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
+        "loose-envify": "^1.1.0",
+        "scheduler": "^0.21.0"
       },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+      "peerDependencies": {
+        "react": "^18.0.0"
       }
     },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/cloudinary-react-native/node_modules/react-is": {
+      "version": "17.0.2",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
+      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/react-native-fs": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz",
+      "integrity": "sha512-VkTBzs7fIDUiy/XajOSNk0XazFE9l+QlMAce7lGuebZcag5CnjszB+u4BdqzwaQOdcYb5wsJIsqq4kxInIRpJQ==",
       "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "base-64": "^0.1.0",
+        "utf8": "^3.0.0"
+      },
+      "peerDependencies": {
+        "react-native": "*",
+        "react-native-windows": "*"
+      },
+      "peerDependenciesMeta": {
+        "react-native-windows": {
+          "optional": true
+        }
       }
     },
-    "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
+    "node_modules/cloudinary-react-native/node_modules/scheduler": {
+      "version": "0.21.0",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz",
+      "integrity": "sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==",
+      "dependencies": {
+        "loose-envify": "^1.1.0"
       }
     },
-    "node_modules/dotenv-expand": {
-      "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
-      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+    "node_modules/cloudinary-react-native/node_modules/semver": {
+      "version": "7.3.8",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
+      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
       "dependencies": {
-        "dotenv": "^16.4.5"
+        "lru-cache": "^6.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://dotenvx.com"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+    "node_modules/cloudinary-react-native/node_modules/send": {
+      "version": "0.18.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
+      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
+      "peer": true,
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
-    },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
-    },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.103",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
-      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA=="
-    },
-    "node_modules/emittery": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+    "node_modules/cloudinary-react-native/node_modules/send/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "peer": true,
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    "node_modules/cloudinary-react-native/node_modules/send/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
+      "peer": true
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+    "node_modules/cloudinary-react-native/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+      "peer": true,
+      "dependencies": {
+        "shebang-regex": "^1.0.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
+    "node_modules/cloudinary-react-native/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+    "node_modules/cloudinary-react-native/node_modules/ssri": {
+      "version": "8.0.1",
+      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
+      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
+      "peer": true,
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "minipass": "^3.1.1"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
+    "node_modules/cloudinary-react-native/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "peer": true,
       "engines": {
-        "node": ">=0.12"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/env-editor": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/env-editor/-/env-editor-0.4.2.tgz",
-      "integrity": "sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/cloudinary-react-native/node_modules/sucrase": {
+      "version": "3.34.0",
+      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz",
+      "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==",
+      "dependencies": {
+        "@jridgewell/gen-mapping": "^0.3.2",
+        "commander": "^4.0.0",
+        "glob": "7.1.6",
+        "lines-and-columns": "^1.1.6",
+        "mz": "^2.7.0",
+        "pirates": "^4.0.1",
+        "ts-interface-checker": "^0.1.9"
+      },
+      "bin": {
+        "sucrase": "bin/sucrase",
+        "sucrase-node": "bin/sucrase-node"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/eol": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/eol/-/eol-0.9.1.tgz",
-      "integrity": "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="
+    "node_modules/cloudinary-react-native/node_modules/sucrase/node_modules/commander": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
+      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+    "node_modules/cloudinary-react-native/node_modules/sudo-prompt": {
+      "version": "9.1.1",
+      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.1.1.tgz",
+      "integrity": "sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==",
+      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
+      "peer": true
+    },
+    "node_modules/cloudinary-react-native/node_modules/temp-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
+      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/type-fest": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/unique-filename": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
+      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
+      "peer": true,
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "unique-slug": "^2.0.0"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
+    "node_modules/cloudinary-react-native/node_modules/unique-slug": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
+      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
+      "peer": true,
       "dependencies": {
-        "stackframe": "^1.3.4"
+        "imurmurhash": "^0.1.4"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
+      "peer": true,
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.2",
-        "arraybuffer.prototype.slice": "^1.0.4",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "data-view-buffer": "^1.0.2",
-        "data-view-byte-length": "^1.0.2",
-        "data-view-byte-offset": "^1.0.1",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.1.0",
-        "es-to-primitive": "^1.3.0",
-        "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
-        "get-symbol-description": "^1.1.0",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.1.0",
-        "is-array-buffer": "^3.0.5",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.2",
-        "is-regex": "^1.2.1",
-        "is-shared-array-buffer": "^1.0.4",
-        "is-string": "^1.1.1",
-        "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
-        "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.7",
-        "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
-        "safe-array-concat": "^1.1.3",
-        "safe-push-apply": "^1.0.0",
-        "safe-regex-test": "^1.1.0",
-        "set-proto": "^1.0.0",
-        "string.prototype.trim": "^1.2.10",
-        "string.prototype.trimend": "^1.0.9",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-length": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4",
-        "typed-array-length": "^1.0.7",
-        "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "crypto-random-string": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+    "node_modules/cloudinary-react-native/node_modules/universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+      "peer": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/cloudinary-react-native/node_modules/uuid": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
+      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
+      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
+      "peer": true,
+      "bin": {
+        "uuid": "bin/uuid"
       }
     },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
-      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/validate-npm-package-name": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
+      "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
+      "peer": true,
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.6",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.6",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "internal-slot": "^1.1.0",
-        "iterator.prototype": "^1.1.4",
-        "safe-array-concat": "^1.1.3"
+        "builtins": "^1.0.3"
+      }
+    },
+    "node_modules/cloudinary-react-native/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+      "peer": true,
+      "dependencies": {
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
+    "node_modules/cloudinary-react-native/node_modules/wonka": {
+      "version": "4.0.15",
+      "resolved": "https://registry.npmjs.org/wonka/-/wonka-4.0.15.tgz",
+      "integrity": "sha512-U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg==",
       "peer": true
     },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+    "node_modules/cloudinary-react-native/node_modules/xml2js": {
+      "version": "0.4.23",
+      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
+      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
+      "peer": true,
       "dependencies": {
-        "es-errors": "^1.3.0"
+        "sax": ">=0.6.0",
+        "xmlbuilder": "~11.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
+    "node_modules/cloudinary-react-native/node_modules/xml2js/node_modules/xmlbuilder": {
+      "version": "11.0.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
+      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
+      "peer": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=4.0"
       }
     },
-    "node_modules/es-shim-unscopables": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
-      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
-      "dev": true,
+    "node_modules/cloudinary-react-native/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
+      }
+    },
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
+    },
+    "node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "license": "MIT",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12.5.0"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-      "dev": true,
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
+        "color-name": "~1.1.4"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
-      "engines": {
-        "node": ">=6"
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "license": "MIT",
+      "dependencies": {
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    "node_modules/colord": {
+      "version": "2.9.3",
+      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
+      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
     },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/colorette": {
+      "version": "2.0.20",
+      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
+      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
     },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "delayed-stream": "~1.0.0"
       },
       "engines": {
-        "node": ">=6.0"
-      },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
+    "node_modules/command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
+    },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10"
       }
     },
-    "node_modules/eslint": {
-      "version": "9.21.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
-      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
-      "dev": true,
-      "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.2",
-        "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.21.0",
-        "@eslint/plugin-kit": "^0.2.7",
-        "@humanfs/node": "^0.16.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.2",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.6",
-        "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
-        "esquery": "^1.5.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
+    },
+    "node_modules/compare-versions": {
+      "version": "3.6.0",
+      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
+      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
+      "peer": true
+    },
+    "node_modules/component-type": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
+      "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==",
       "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "jiti": "*"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        }
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz",
-      "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==",
-      "dev": true,
-      "bin": {
-        "eslint-config-prettier": "build/bin/cli.js"
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+      "dependencies": {
+        "mime-db": ">= 1.43.0 < 2"
       },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.8.3.tgz",
-      "integrity": "sha512-A0bu4Ks2QqDWNpeEgTQMPTngaMhuDu4yv6xpftBMAf+1ziXnpx+eSR1WRfoPTe2BAiAjHFZ7kSNx1fvr5g5pmQ==",
-      "dev": true,
+    "node_modules/compression": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
       "dependencies": {
-        "@nolyfill/is-core-module": "1.0.39",
-        "debug": "^4.3.7",
-        "enhanced-resolve": "^5.15.0",
-        "get-tsconfig": "^4.10.0",
-        "is-bun-module": "^1.0.2",
-        "stable-hash": "^0.0.4",
-        "tinyglobby": "^0.2.12"
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
+        "debug": "2.6.9",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.2.1",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*",
-        "eslint-plugin-import-x": "*"
-      },
-      "peerDependenciesMeta": {
-        "eslint-plugin-import": {
-          "optional": true
-        },
-        "eslint-plugin-import-x": {
-          "optional": true
-        }
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.37.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
-      "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
-      "dev": true,
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "array-includes": "^3.1.8",
-        "array.prototype.findlast": "^1.2.5",
-        "array.prototype.flatmap": "^1.3.3",
-        "array.prototype.tosorted": "^1.1.4",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.2.1",
-        "estraverse": "^5.3.0",
-        "hasown": "^2.0.2",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.8",
-        "object.fromentries": "^2.0.8",
-        "object.values": "^1.2.1",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.5",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.12",
-        "string.prototype.repeat": "^1.0.0"
-      },
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/compression/node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint-plugin-react-native": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-5.0.0.tgz",
-      "integrity": "sha512-VyWlyCC/7FC/aONibOwLkzmyKg4j9oI8fzrk9WYNs4I8/m436JuOTAFwLvEn1CVvc7La4cPfbCyspP4OYpP52Q==",
-      "dev": true,
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/concat-stream": {
+      "version": "1.6.2",
+      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
+      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
+      "engines": [
+        "node >= 0.8"
+      ],
       "dependencies": {
-        "eslint-plugin-react-native-globals": "^0.1.1"
-      },
-      "peerDependencies": {
-        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+        "buffer-from": "^1.0.0",
+        "inherits": "^2.0.3",
+        "readable-stream": "^2.2.2",
+        "typedarray": "^0.0.6"
       }
     },
-    "node_modules/eslint-plugin-react-native-globals": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz",
-      "integrity": "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==",
-      "dev": true
+    "node_modules/concat-stream/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
     },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
-      "dev": true,
+    "node_modules/concat-stream/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
       "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/concat-stream/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/concat-stream/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+      "dependencies": {
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
       },
-      "bin": {
-        "resolve": "bin/resolve"
+      "engines": {
+        "node": ">= 0.10.0"
+      }
+    },
+    "node_modules/connect-history-api-fallback": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
+      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/console-browserify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
+      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
+    },
+    "node_modules/constants-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
+      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
+    },
+    "node_modules/content-disposition": {
+      "version": "0.5.4",
+      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
+      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+      "dependencies": {
+        "safe-buffer": "5.2.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
-      "dev": true,
+    "node_modules/content-type": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
+      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/cookie": {
+      "version": "0.7.1",
+      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
+      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/cookie-signature": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
+      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
+    },
+    "node_modules/copy-webpack-plugin": {
+      "version": "10.2.4",
+      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
+      "integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "fast-glob": "^3.2.7",
+        "glob-parent": "^6.0.1",
+        "globby": "^12.0.2",
+        "normalize-path": "^3.0.0",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">= 12.20.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.1.0"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
+    "node_modules/copy-webpack-plugin/node_modules/array-union": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
+      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
+    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
       "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
-      "dev": true,
       "dependencies": {
         "is-glob": "^4.0.3"
       },
@@ -7932,856 +9372,739 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
-      "dev": true,
+    "node_modules/copy-webpack-plugin/node_modules/globby": {
+      "version": "12.2.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
+      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
       "dependencies": {
-        "acorn": "^8.14.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+        "array-union": "^3.0.1",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.7",
+        "ignore": "^5.1.9",
+        "merge2": "^1.4.1",
+        "slash": "^4.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
       },
       "funding": {
-        "url": "https://opencollective.com/eslint"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
+    "node_modules/copy-webpack-plugin/node_modules/slash": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
+      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
       "engines": {
-        "node": ">=4"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-      "dev": true,
+    "node_modules/core-js": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
+      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
+      }
+    },
+    "node_modules/core-js-compat": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
+      "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "browserslist": "^4.24.3"
       },
-      "engines": {
-        "node": ">=0.10"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/core-util-is": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
+      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
+    },
+    "node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=4"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
+      "bin": {
+        "create-jest": "bin/create-jest.js"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/cross-fetch": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
+      "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
+      "dependencies": {
+        "node-fetch": "^2.7.0"
+      }
+    },
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+      "dependencies": {
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 8"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
       "engines": {
-        "node": ">= 0.6"
+        "node": "*"
       }
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
-      "peer": true,
+    "node_modules/css-declaration-sorter": {
+      "version": "6.4.1",
+      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
+      "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
       "engines": {
-        "node": ">=0.8.x"
+        "node": "^10 || ^12 || >=14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.0.9"
       }
     },
-    "node_modules/exec-async": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
-      "integrity": "sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw=="
-    },
-    "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+    "node_modules/css-in-js-utils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz",
+      "integrity": "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==",
       "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=6"
+        "hyphenate-style-name": "^1.0.3"
       }
     },
-    "node_modules/execa/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+    "node_modules/css-loader": {
+      "version": "6.11.0",
+      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
+      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "icss-utils": "^5.1.0",
+        "postcss": "^8.4.33",
+        "postcss-modules-extract-imports": "^3.1.0",
+        "postcss-modules-local-by-default": "^4.0.5",
+        "postcss-modules-scope": "^3.2.0",
+        "postcss-modules-values": "^4.0.0",
+        "postcss-value-parser": "^4.2.0",
+        "semver": "^7.5.4"
       },
       "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/execa/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/execa/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
+        "node": ">= 12.13.0"
       },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/execa/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/execa/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "dependencies": {
-        "isexe": "^2.0.0"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       },
-      "bin": {
-        "which": "bin/which"
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/css-loader/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=10"
       }
     },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+    "node_modules/css-minimizer-webpack-plugin": {
+      "version": "3.4.1",
+      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
+      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
       "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "cssnano": "^5.0.6",
+        "jest-worker": "^27.0.2",
+        "postcss": "^8.3.5",
+        "schema-utils": "^4.0.0",
+        "serialize-javascript": "^6.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/expo": {
-      "version": "52.0.37",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-52.0.37.tgz",
-      "integrity": "sha512-fo37ClqjNLOVInerm7BU27H8lfPfeTC7Pmu72roPzq46DnJfs+KzTxTzE34GcJ0b6hMUx9FRSSGyTQqxzo2TVQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.20.0",
-        "@expo/cli": "0.22.18",
-        "@expo/config": "~10.0.10",
-        "@expo/config-plugins": "~9.0.15",
-        "@expo/fingerprint": "0.11.11",
-        "@expo/metro-config": "0.19.11",
-        "@expo/vector-icons": "^14.0.0",
-        "babel-preset-expo": "~12.0.9",
-        "expo-asset": "~11.0.4",
-        "expo-constants": "~17.0.7",
-        "expo-file-system": "~18.0.11",
-        "expo-font": "~13.0.4",
-        "expo-keep-awake": "~14.0.3",
-        "expo-modules-autolinking": "2.0.8",
-        "expo-modules-core": "2.2.2",
-        "fbemitter": "^3.0.0",
-        "web-streams-polyfill": "^3.3.2",
-        "whatwg-url-without-unicode": "8.0.0-3"
+        "node": ">= 12.13.0"
       },
-      "bin": {
-        "expo": "bin/cli"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
       },
       "peerDependencies": {
-        "@expo/dom-webview": "*",
-        "@expo/metro-runtime": "*",
-        "react": "*",
-        "react-native": "*",
-        "react-native-webview": "*"
+        "webpack": "^5.0.0"
       },
       "peerDependenciesMeta": {
-        "@expo/dom-webview": {
+        "@parcel/css": {
           "optional": true
         },
-        "@expo/metro-runtime": {
+        "clean-css": {
           "optional": true
         },
-        "react-native-webview": {
+        "csso": {
+          "optional": true
+        },
+        "esbuild": {
           "optional": true
         }
       }
     },
-    "node_modules/expo-asset": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.4.tgz",
-      "integrity": "sha512-CdIywU0HrR3wsW5c3n0cT3jW9hccZdnqGsRqY+EY/RWzJbDXtDfAQVEiFHO3mDK7oveUwrP2jK/6ZRNek41/sg==",
+    "node_modules/css-minimizer-webpack-plugin/node_modules/jest-worker": {
+      "version": "27.5.1",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
+      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
       "dependencies": {
-        "@expo/image-utils": "^0.6.5",
-        "expo-constants": "~17.0.7",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3"
+        "@types/node": "*",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">= 10.13.0"
       }
     },
-    "node_modules/expo-constants": {
-      "version": "17.0.7",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.7.tgz",
-      "integrity": "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA==",
-      "license": "MIT",
-      "dependencies": {
-        "@expo/config": "~10.0.10",
-        "@expo/env": "~0.4.2"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-eas-client": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/expo-eas-client/-/expo-eas-client-0.13.3.tgz",
-      "integrity": "sha512-t+1F1tiDocSot8iSnrn/CjTUMvVvPV2DpafSVcticpbSzMGybEN7wcamO1t18fK7WxGXpZE9gxtd80qwv/LLqQ==",
-      "license": "MIT"
-    },
-    "node_modules/expo-file-system": {
-      "version": "18.0.11",
-      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.11.tgz",
-      "integrity": "sha512-yDwYfEzWgPXsBZHJW2RJ8Q66ceiFN9Wa5D20pp3fjXVkzPBDwxnYwiPWk4pVmCa5g4X5KYMoMne1pUrsL4OEpg==",
+    "node_modules/css-minimizer-webpack-plugin/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dependencies": {
-        "web-streams-polyfill": "^3.3.2"
+        "has-flag": "^4.0.0"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/expo-font": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-13.0.4.tgz",
-      "integrity": "sha512-eAP5hyBgC8gafFtprsz0HMaB795qZfgJWqTmU0NfbSin1wUuVySFMEPMOrTkTgmazU73v4Cb4x7p86jY1XXYUw==",
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
       "dependencies": {
-        "fontfaceobserver": "^2.1.0"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
-      }
-    },
-    "node_modules/expo-image-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-5.0.0.tgz",
-      "integrity": "sha512-Eg+5FHtyzv3Jjw9dHwu2pWy4xjf8fu3V0Asyy42kO+t/FbvW/vjUixpTjPtgKQLQh+2/9Nk4JjFDV6FwCnF2ZA==",
-      "peerDependencies": {
-        "expo": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/expo-image-picker": {
-      "version": "16.0.6",
-      "resolved": "https://registry.npmjs.org/expo-image-picker/-/expo-image-picker-16.0.6.tgz",
-      "integrity": "sha512-HN4xZirFjsFDIsWFb12AZh19fRzuvZjj2ll17cGr19VNRP06S/VPQU3Tdccn5vwUzQhOBlLu704CnNm278boiQ==",
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dependencies": {
-        "expo-image-loader": "~5.0.0"
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/expo-json-utils": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
-      "integrity": "sha512-xjGfK9dL0B1wLnOqNkX0jM9p48Y0I5xEPzHude28LY67UmamUyAACkqhZGaPClyPNfdzczk7Ej6WaRMT3HfXvw==",
-      "license": "MIT"
-    },
-    "node_modules/expo-keep-awake": {
-      "version": "14.0.3",
-      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-14.0.3.tgz",
-      "integrity": "sha512-6Jh94G6NvTZfuLnm2vwIpKe3GdOiVBuISl7FI8GqN0/9UOg9E0WXXp5cDcfAG8bn80RfgLJS8P7EPUGTZyOvhg==",
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-linking": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-7.0.5.tgz",
-      "integrity": "sha512-3KptlJtcYDPWohk0MfJU75MJFh2ybavbtcSd84zEPfw9s1q3hjimw3sXnH03ZxP54kiEWldvKmmnGcVffBDB1g==",
-      "license": "MIT",
-      "dependencies": {
-        "expo-constants": "~17.0.5",
-        "invariant": "^2.2.4"
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "engines": {
+        "node": ">= 6"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/expo-location": {
-      "version": "18.0.10",
-      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
-      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "bin": {
+        "cssesc": "bin/cssesc"
+      },
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/expo-manifests": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.15.7.tgz",
-      "integrity": "sha512-IVzLcPamzUi4Br96xw6JPHaa1vjYupUnMqYyV1Mtd9VQojS5hJsf5VcVzbAMZE/cFGzWLZ1oJa6QXxYjN39Uww==",
-      "license": "MIT",
+    "node_modules/cssnano": {
+      "version": "5.1.15",
+      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
+      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
       "dependencies": {
-        "@expo/config": "~10.0.10",
-        "expo-json-utils": "~0.14.0"
+        "cssnano-preset-default": "^5.2.14",
+        "lilconfig": "^2.0.3",
+        "yaml": "^1.10.2"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/cssnano"
       },
       "peerDependencies": {
-        "expo": "*"
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/cssnano-preset-default": {
+      "version": "5.2.14",
+      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
+      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
+      "dependencies": {
+        "css-declaration-sorter": "^6.3.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-calc": "^8.2.3",
+        "postcss-colormin": "^5.3.1",
+        "postcss-convert-values": "^5.1.3",
+        "postcss-discard-comments": "^5.1.2",
+        "postcss-discard-duplicates": "^5.1.0",
+        "postcss-discard-empty": "^5.1.1",
+        "postcss-discard-overridden": "^5.1.0",
+        "postcss-merge-longhand": "^5.1.7",
+        "postcss-merge-rules": "^5.1.4",
+        "postcss-minify-font-values": "^5.1.0",
+        "postcss-minify-gradients": "^5.1.1",
+        "postcss-minify-params": "^5.1.4",
+        "postcss-minify-selectors": "^5.2.1",
+        "postcss-normalize-charset": "^5.1.0",
+        "postcss-normalize-display-values": "^5.1.0",
+        "postcss-normalize-positions": "^5.1.1",
+        "postcss-normalize-repeat-style": "^5.1.1",
+        "postcss-normalize-string": "^5.1.0",
+        "postcss-normalize-timing-functions": "^5.1.0",
+        "postcss-normalize-unicode": "^5.1.1",
+        "postcss-normalize-url": "^5.1.0",
+        "postcss-normalize-whitespace": "^5.1.1",
+        "postcss-ordered-values": "^5.1.3",
+        "postcss-reduce-initial": "^5.1.2",
+        "postcss-reduce-transforms": "^5.1.0",
+        "postcss-svgo": "^5.1.0",
+        "postcss-unique-selectors": "^5.1.1"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/expo-modules-autolinking": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.8.tgz",
-      "integrity": "sha512-DezgnEYFQYic8hKGhkbztBA3QUmSftjaNDIKNAtS2iGJmzCcNIkatjN2slFDSWjSTNo8gOvPQyMKfyHWFvLpOQ==",
-      "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "chalk": "^4.1.0",
-        "commander": "^7.2.0",
-        "fast-glob": "^3.2.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.1.0",
-        "require-from-string": "^2.0.2",
-        "resolve-from": "^5.0.0"
+    "node_modules/cssnano-utils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
+      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
       },
-      "bin": {
-        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
+    "node_modules/cssnano/node_modules/lilconfig": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
+      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
       "engines": {
         "node": ">=10"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/expo-modules-autolinking/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
+    "node_modules/cssnano/node_modules/yaml": {
+      "version": "1.10.2",
+      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
+      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/expo-modules-core": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-2.2.2.tgz",
-      "integrity": "sha512-SgjK86UD89gKAscRK3bdpn6Ojfs/KU4GujtuFx1wm4JaBjmXH4aakWkItkPlAV2pjIiHJHWQbENL9xjbw/Qr/g==",
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "invariant": "^2.2.4"
+        "css-tree": "~2.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/expo-router": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-4.0.17.tgz",
-      "integrity": "sha512-8ybo6bVwdG1S9hafh9BTOjX1hpCgomdUvs6hKHMM01koo8mQ7zocH/+zxQeaMVDxGhboz2dO5GiDchWJ0OheRA==",
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "dev": true,
       "license": "MIT",
       "dependencies": {
-        "@expo/metro-runtime": "4.0.1",
-        "@expo/server": "^0.5.1",
-        "@radix-ui/react-slot": "1.0.1",
-        "@react-navigation/bottom-tabs": "^7.2.0",
-        "@react-navigation/native": "^7.0.14",
-        "@react-navigation/native-stack": "^7.2.0",
-        "client-only": "^0.0.1",
-        "react-helmet-async": "^1.3.0",
-        "react-native-helmet-async": "2.0.4",
-        "react-native-is-edge-to-edge": "^1.1.6",
-        "schema-utils": "^4.0.1",
-        "semver": "~7.6.3",
-        "server-only": "^0.0.1"
-      },
-      "peerDependencies": {
-        "@react-navigation/drawer": "^7.1.1",
-        "expo": "*",
-        "expo-constants": "*",
-        "expo-linking": "*",
-        "react-native-reanimated": "*",
-        "react-native-safe-area-context": "*",
-        "react-native-screens": "*"
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
       },
-      "peerDependenciesMeta": {
-        "@react-navigation/drawer": {
-          "optional": true
-        },
-        "@testing-library/jest-native": {
-          "optional": true
-        },
-        "react-native-reanimated": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/expo-router/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true,
+      "license": "CC0-1.0"
+    },
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
+    },
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+      "dependencies": {
+        "cssom": "~0.3.6"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/expo-secure-store": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-14.0.1.tgz",
-      "integrity": "sha512-QUS+j4+UG4jRQalgnpmTvvrFnMVLqPiUZRzYPnG3+JrZ5kwVW2w6YS3WWerPoR7C6g3y/a2htRxRSylsDs+TaQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
-      }
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
-    "node_modules/expo-splash-screen": {
-      "version": "0.29.22",
-      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.29.22.tgz",
-      "integrity": "sha512-f+bPpF06bqiuW1Fbrd3nxeaSsmTVTBEKEYe3epYt4IE6y4Ulli3qEUamMLlRQiDGuIXPU6zQlscpy2mdBUI5cA==",
-      "license": "MIT",
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "devOptional": true
+    },
+    "node_modules/d64": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
+      "integrity": "sha512-5eNy3WZziVYnrogqgXhcdEmqcDB2IHurTqLcrgssJsfkMVCUoUaZpK6cJjxxvLV2dUm5SuJMNcYfVGoin9UIRw==",
+      "peer": true
+    },
+    "node_modules/dag-map": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz",
+      "integrity": "sha512-+LSAiGFwQ9dRnRdOeaj7g47ZFJcOUPukAP8J3A3fuZ1g9Y44BG+P1sgApjLXTQPOzC4+7S9Wr8kXsfpINM4jpw==",
+      "peer": true
+    },
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
       "dependencies": {
-        "@expo/prebuild-config": "^8.0.27"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/expo-status-bar": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-2.0.1.tgz",
-      "integrity": "sha512-AkIPX7jWHRPp83UBZ1iXtVvyr0g+DgBVvIXTtlmPtmUsm8Vq9Bb5IGj86PW8osuFlgoTVAg7HI/+Ok7yEYwiRg==",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/expo-structured-headers": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-4.0.0.tgz",
-      "integrity": "sha512-uPiwZjWq3AdFGgY52+I2nGPrNa6izxAglymPXHUZLekZW290GqIUOk7MBNDD4sg4JwUbSi3gdxEurpEvuq+FSg==",
-      "license": "MIT"
+    "node_modules/data-urls/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/expo-updates": {
-      "version": "0.27.1",
-      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.27.1.tgz",
-      "integrity": "sha512-1iCU/icvanYuJonHottHcTeYGxOAXcIOfeW0FXmELGLkliHpbXtFthmeiucIcdefgebIz3GxHk9CiTS0QrT7ZA==",
-      "license": "MIT",
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dependencies": {
-        "@expo/code-signing-certificates": "0.0.5",
-        "@expo/config": "~10.0.10",
-        "@expo/config-plugins": "~9.0.16",
-        "@expo/spawn-async": "^1.7.2",
-        "arg": "4.1.0",
-        "chalk": "^4.1.2",
-        "expo-eas-client": "~0.13.3",
-        "expo-manifests": "~0.15.7",
-        "expo-structured-headers": "~4.0.0",
-        "expo-updates-interface": "~1.0.0",
-        "fast-glob": "^3.3.2",
-        "fbemitter": "^3.0.0",
-        "ignore": "^5.3.1",
-        "resolve-from": "^5.0.0"
-      },
-      "bin": {
-        "expo-updates": "bin/cli.js"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
-      }
-    },
-    "node_modules/expo-updates-interface": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-1.0.0.tgz",
-      "integrity": "sha512-93oWtvULJOj+Pp+N/lpTcFfuREX1wNeHtp7Lwn8EbzYYmdn37MvZU3TPW2tYYCZuhzmKEXnUblYcruYoDu7IrQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/expo-updates/node_modules/arg": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
-      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
-      "license": "MIT"
-    },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
-    },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fast-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ]
-    },
-    "node_modules/fastq": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
       "dependencies": {
-        "reusify": "^1.0.4"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
       "dependencies": {
-        "bser": "2.1.1"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fbemitter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
-      "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
-      "dependencies": {
-        "fbjs": "^3.0.0"
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
       }
     },
-    "node_modules/fbjs": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
-      "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "fbjs-css-vars": "^1.0.0",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^1.0.35"
-      }
-    },
-    "node_modules/fbjs-css-vars": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
-      "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
-    },
-    "node_modules/fdir": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
-      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
-      "dev": true,
-      "peerDependencies": {
-        "picomatch": "^3 || ^4"
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
       },
       "peerDependenciesMeta": {
-        "picomatch": {
+        "supports-color": {
           "optional": true
         }
       }
     },
-    "node_modules/fetch-retry": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
-      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
+    "node_modules/decimal.js": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
     },
-    "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-      "dev": true,
-      "dependencies": {
-        "flat-cache": "^4.0.0"
-      },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=16.0.0"
+        "node": ">=0.10"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
-      "dependencies": {
-        "to-regex-range": "^5.0.1"
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
-      "license": "MIT",
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
     },
-    "node_modules/find-babel-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.1.2.tgz",
-      "integrity": "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json5": "^2.2.3"
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+    "node_modules/default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "clone": "^1.0.2"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-      "dev": true,
+    "node_modules/deferred-leveldown": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz",
+      "integrity": "sha512-+WCbb4+ez/SZ77Sdy1iadagFiVzMB89IKOBhglgnUkVxOxRWmmFsz8UDSNWh4Rhq+3wr/vMFlYj+rdEwWUDdng==",
+      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
       "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
-      },
-      "engines": {
-        "node": ">=16"
+        "abstract-leveldown": "~0.12.1"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-      "dev": true
-    },
-    "node_modules/flow-enums-runtime": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz",
-      "integrity": "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="
+    "node_modules/deferred-leveldown/node_modules/abstract-leveldown": {
+      "version": "0.12.4",
+      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz",
+      "integrity": "sha512-TOod9d5RDExo6STLMGa+04HGkl+TlMfbDnTyN93/ETJ9DpQ0DaYLqcMZlbXvdc4W3vVo1Qrl+WhSp8zvDsJ+jA==",
+      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
+      "dependencies": {
+        "xtend": "~3.0.0"
+      }
     },
-    "node_modules/flow-parser": {
-      "version": "0.261.2",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.261.2.tgz",
-      "integrity": "sha512-RtunoakA3YjtpAxPSOBVW6lmP5NYmETwkpAfNkdr8Ovf86ENkbD3mtPWnswFTIUtRvjwv0i8ZSkHK+AzsUg1JA==",
+    "node_modules/deferred-leveldown/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
       "engines": {
-        "node": ">=0.4.0"
+        "node": ">=0.4"
       }
     },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dependencies": {
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "debug": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/fontfaceobserver": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz",
-      "integrity": "sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg=="
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/for-each": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
-      "dev": true,
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
       "dependencies": {
-        "is-callable": "^1.2.7"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
         "node": ">= 0.4"
@@ -8790,411 +10113,443 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+    "node_modules/del": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/form-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
-      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.35"
-      },
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
       "engines": {
-        "node": ">= 6"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/freeport-async": {
+    "node_modules/depd": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz",
-      "integrity": "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
-      "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": ">=0.10"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
-      "dependencies": {
-        "minipass": "^7.0.3"
-      },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    "node_modules/detect-node": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
+      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
     },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
     },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
-      "dev": true,
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
+        "path-type": "^4.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "dev": true,
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
     },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
+    "node_modules/dns-packet": {
+      "version": "5.6.1",
+      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
+      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+      "dependencies": {
+        "@leichtgewicht/ip-codec": "^2.0.1"
+      },
       "engines": {
-        "node": ">=6.9.0"
+        "node": ">=6"
       }
     },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
-      "engines": {
-        "node": "6.* || 8.* || >= 10.*"
-      }
+    "node_modules/dns.js": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dns.js/-/dns.js-1.0.1.tgz",
+      "integrity": "sha512-taQ05oSLPD0xY/zeOn21TfiinTrk2GjGyJC9q0WIohi7UiOWo9v8Io2kiNU1hpf1HyqX/SihAyDXkIW0cUt2ug=="
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+    "node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/dom-converter": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
+      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+      "dependencies": {
+        "utila": "~0.4"
+      }
+    },
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+    "node_modules/domain-browser": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
+      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
       "engines": {
-        "node": ">=8.0.0"
+        "node": ">=0.4",
+        "npm": ">=1.2"
       }
     },
-    "node_modules/get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
     },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=12"
       }
     },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
-      "dependencies": {
-        "pump": "^3.0.0"
-      },
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
-      "dev": true,
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6"
+        "domelementtype": "^2.3.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/get-tsconfig": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
-      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
-      "dev": true,
+    "node_modules/domutils": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
       "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
       "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/getenv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
-      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==",
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "license": "MIT",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
       "engines": {
-        "node": ">=6"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+    "node_modules/dotenv-expand": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "dotenv": "^16.4.5"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
-      "peer": true
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
-      }
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
     },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.103",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
+      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA=="
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/globals": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
-      "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
-      "dev": true,
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "node_modules/emojis-list": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
+      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
       "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 4"
       }
     },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dev": true,
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
+        "once": "^1.4.0"
+      }
+    },
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.12"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    "node_modules/env-editor": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/env-editor/-/env-editor-0.4.2.tgz",
+      "integrity": "sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA==",
+      "engines": {
+        "node": ">=8"
+      }
     },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
+    "node_modules/eol": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/eol/-/eol-0.9.1.tgz",
+      "integrity": "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="
     },
-    "node_modules/has-bigints": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
-      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/errno": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
+      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+      "dependencies": {
+        "prr": "~1.0.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "errno": "cli.js"
       }
     },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+      "dependencies": {
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dev": true,
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "stackframe": "^1.3.4"
       }
     },
-    "node_modules/has-proto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-      "dev": true,
+    "node_modules/es-abstract": {
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
       "dependencies": {
-        "dunder-proto": "^1.0.0"
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
         "node": ">= 0.4"
@@ -9203,4336 +10558,7839 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
       "engines": {
         "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+    "node_modules/es-iterator-helpers": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
+      "dev": true,
       "dependencies": {
-        "function-bind": "^1.1.2"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.6",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.4",
+        "safe-array-concat": "^1.1.3"
       },
       "engines": {
         "node": ">= 0.4"
       }
     },
-    "node_modules/hermes-estree": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
-      "integrity": "sha512-eT5MU3f5aVhTqsfIReZ6n41X5sYn4IdQL0nvz6yO+MMlPxw49aSARHLg/MSehQftyjnrE8X6bYregzSumqc6cg=="
-    },
-    "node_modules/hermes-parser": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.23.1.tgz",
-      "integrity": "sha512-oxl5h2DkFW83hT4DAUJorpah8ou4yvmweUzLJmmr6YV2cezduCdlil1AvU/a/xSsAFo4WUcNA4GoV5Bvq6JffA==",
-      "dependencies": {
-        "hermes-estree": "0.23.1"
-      }
+    "node_modules/es-module-lexer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ=="
     },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "license": "BSD-3-Clause",
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dependencies": {
-        "react-is": "^16.7.0"
+        "es-errors": "^1.3.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
-    },
-    "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
       "dependencies": {
-        "lru-cache": "^10.0.1"
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "dev": true,
       "dependencies": {
-        "whatwg-encoding": "^2.0.0"
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+    "node_modules/es-to-primitive": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
       "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6"
       }
     },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
+    },
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
       "engines": {
-        "node": ">= 6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": ">= 6"
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
       "engines": {
-        "node": ">=10.17.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/husky": {
-      "version": "9.1.7",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
-      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+    "node_modules/eslint": {
+      "version": "9.21.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
+      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
       "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.21.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
       "bin": {
-        "husky": "bin.js"
+        "eslint": "bin/eslint.js"
       },
       "engines": {
-        "node": ">=18"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/typicode"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
+    "node_modules/eslint-config-prettier": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz",
+      "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "build/bin/cli.js"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
       }
     },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
-      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.8.3.tgz",
+      "integrity": "sha512-A0bu4Ks2QqDWNpeEgTQMPTngaMhuDu4yv6xpftBMAf+1ziXnpx+eSR1WRfoPTe2BAiAjHFZ7kSNx1fvr5g5pmQ==",
+      "dev": true,
       "dependencies": {
-        "queue": "6.0.2"
-      },
-      "bin": {
-        "image-size": "bin/image-size.js"
+        "@nolyfill/is-core-module": "1.0.39",
+        "debug": "^4.3.7",
+        "enhanced-resolve": "^5.15.0",
+        "get-tsconfig": "^4.10.0",
+        "is-bun-module": "^1.0.2",
+        "stable-hash": "^0.0.4",
+        "tinyglobby": "^0.2.12"
       },
       "engines": {
-        "node": ">=16.x"
-      }
-    },
-    "node_modules/immer": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
-      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
-      "license": "MIT",
+        "node": "^14.18.0 || >=16.0.0"
+      },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
       }
     },
-    "node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
+      "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
+      "dev": true,
       "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.2.1",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
         "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-      "engines": {
-        "node": ">=4"
+    "node_modules/eslint-plugin-react-native": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-5.0.0.tgz",
+      "integrity": "sha512-VyWlyCC/7FC/aONibOwLkzmyKg4j9oI8fzrk9WYNs4I8/m436JuOTAFwLvEn1CVvc7La4cPfbCyspP4OYpP52Q==",
+      "dev": true,
+      "dependencies": {
+        "eslint-plugin-react-native-globals": "^0.1.1"
+      },
+      "peerDependencies": {
+        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
       }
     },
-    "node_modules/import-local": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+    "node_modules/eslint-plugin-react-native-globals": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz",
+      "integrity": "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==",
+      "dev": true
+    },
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "dev": true,
       "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
       },
       "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
+        "resolve": "bin/resolve"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+    "node_modules/eslint-scope": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "dev": true,
       "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+    "node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
+    },
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
-        "p-locate": "^4.1.0"
+        "is-glob": "^4.0.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
       "dependencies": {
-        "find-up": "^4.0.0"
+        "estraverse": "^5.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10"
       }
     },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+      "dependencies": {
+        "estraverse": "^5.2.0"
+      },
       "engines": {
-        "node": ">=0.8.19"
+        "node": ">=4.0"
       }
     },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=4.0"
       }
     },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dependencies": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "dev": true,
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.2",
-        "side-channel": "^1.1.0"
-      },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       }
     },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
+    "node_modules/eventemitter3": {
+      "version": "4.0.7",
+      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
+      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
     },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.8.x"
       }
     },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
+    "node_modules/exec-async": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
+      "integrity": "sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw=="
     },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-      "dev": true,
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-async-function": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-      "dev": true,
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
       "dependencies": {
-        "async-function": "^1.0.0",
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.8"
       }
     },
-    "node_modules/is-bigint": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-      "dev": true,
-      "dependencies": {
-        "has-bigints": "^1.0.2"
-      },
+    "node_modules/execa/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+    "node_modules/execa/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dependencies": {
-        "binary-extensions": "^2.0.0"
+        "shebang-regex": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-      "dev": true,
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/is-bun-module": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
-      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
-      "dev": true,
+    "node_modules/execa/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dependencies": {
-        "semver": "^7.6.3"
-      }
-    },
-    "node_modules/is-bun-module/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">=10"
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "dev": true,
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dependencies": {
-        "hasown": "^2.0.2"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/is-data-view": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-      "dev": true,
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-      "dev": true,
+    "node_modules/expo": {
+      "version": "52.0.37",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-52.0.37.tgz",
+      "integrity": "sha512-fo37ClqjNLOVInerm7BU27H8lfPfeTC7Pmu72roPzq46DnJfs+KzTxTzE34GcJ0b6hMUx9FRSSGyTQqxzo2TVQ==",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@babel/runtime": "^7.20.0",
+        "@expo/cli": "0.22.18",
+        "@expo/config": "~10.0.10",
+        "@expo/config-plugins": "~9.0.15",
+        "@expo/fingerprint": "0.11.11",
+        "@expo/metro-config": "0.19.11",
+        "@expo/vector-icons": "^14.0.0",
+        "babel-preset-expo": "~12.0.9",
+        "expo-asset": "~11.0.4",
+        "expo-constants": "~17.0.7",
+        "expo-file-system": "~18.0.11",
+        "expo-font": "~13.0.4",
+        "expo-keep-awake": "~14.0.3",
+        "expo-modules-autolinking": "2.0.8",
+        "expo-modules-core": "2.2.2",
+        "fbemitter": "^3.0.0",
+        "web-streams-polyfill": "^3.3.2",
+        "whatwg-url-without-unicode": "8.0.0-3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "bin": {
-        "is-docker": "cli.js"
+        "expo": "bin/cli"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependencies": {
+        "@expo/dom-webview": "*",
+        "@expo/metro-runtime": "*",
+        "react": "*",
+        "react-native": "*",
+        "react-native-webview": "*"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependenciesMeta": {
+        "@expo/dom-webview": {
+          "optional": true
+        },
+        "@expo/metro-runtime": {
+          "optional": true
+        },
+        "react-native-webview": {
+          "optional": true
+        }
       }
     },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/expo-application": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-5.1.1.tgz",
+      "integrity": "sha512-aDatTcTTCdTbHw8h4/Tq2ilc6InM5ntF9xWCJdOcnUEcglxxGphVI/lzJKBaBF6mJECA8mEOjpVg2EGxOctTwg==",
+      "peer": true,
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-      "dev": true,
+    "node_modules/expo-asset": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.4.tgz",
+      "integrity": "sha512-CdIywU0HrR3wsW5c3n0cT3jW9hccZdnqGsRqY+EY/RWzJbDXtDfAQVEiFHO3mDK7oveUwrP2jK/6ZRNek41/sg==",
       "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@expo/image-utils": "^0.6.5",
+        "expo-constants": "~17.0.7",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/expo-av": {
+      "version": "14.0.7",
+      "resolved": "https://registry.npmjs.org/expo-av/-/expo-av-14.0.7.tgz",
+      "integrity": "sha512-FvKZxyy+2/qcCmp+e1GTK3s4zH8ZO1RfjpqNxh7ARlS1oH8HPtk1AyZAMo52tHz3yQ3UIqxQ2YbI9CFb4065lA==",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
+    "node_modules/expo-constants": {
+      "version": "17.0.7",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.7.tgz",
+      "integrity": "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA==",
+      "license": "MIT",
+      "dependencies": {
+        "@expo/config": "~10.0.10",
+        "@expo/env": "~0.4.2"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
-      "dev": true,
+    "node_modules/expo-crypto": {
+      "version": "13.0.2",
+      "resolved": "https://registry.npmjs.org/expo-crypto/-/expo-crypto-13.0.2.tgz",
+      "integrity": "sha512-7f/IMPYJZkBM21LNEMXGrNo/0uXSVfZTwufUdpNKedJR0fm5fH4DCSN79ZddlV26nF90PuXjK2inIbI6lb0qRA==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
+        "base64-js": "^1.3.0"
       },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+    "node_modules/expo-eas-client": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/expo-eas-client/-/expo-eas-client-0.13.3.tgz",
+      "integrity": "sha512-t+1F1tiDocSot8iSnrn/CjTUMvVvPV2DpafSVcticpbSzMGybEN7wcamO1t18fK7WxGXpZE9gxtd80qwv/LLqQ==",
+      "license": "MIT"
+    },
+    "node_modules/expo-file-system": {
+      "version": "18.0.11",
+      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.11.tgz",
+      "integrity": "sha512-yDwYfEzWgPXsBZHJW2RJ8Q66ceiFN9Wa5D20pp3fjXVkzPBDwxnYwiPWk4pVmCa5g4X5KYMoMne1pUrsL4OEpg==",
       "dependencies": {
-        "is-extglob": "^2.1.1"
+        "web-streams-polyfill": "^3.3.2"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/expo-font": {
+      "version": "13.0.4",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-13.0.4.tgz",
+      "integrity": "sha512-eAP5hyBgC8gafFtprsz0HMaB795qZfgJWqTmU0NfbSin1wUuVySFMEPMOrTkTgmazU73v4Cb4x7p86jY1XXYUw==",
+      "dependencies": {
+        "fontfaceobserver": "^2.1.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
       }
     },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
+    "node_modules/expo-image-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-5.0.0.tgz",
+      "integrity": "sha512-Eg+5FHtyzv3Jjw9dHwu2pWy4xjf8fu3V0Asyy42kO+t/FbvW/vjUixpTjPtgKQLQh+2/9Nk4JjFDV6FwCnF2ZA==",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-number-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-      "dev": true,
+    "node_modules/expo-image-picker": {
+      "version": "16.0.6",
+      "resolved": "https://registry.npmjs.org/expo-image-picker/-/expo-image-picker-16.0.6.tgz",
+      "integrity": "sha512-HN4xZirFjsFDIsWFb12AZh19fRzuvZjj2ll17cGr19VNRP06S/VPQU3Tdccn5vwUzQhOBlLu704CnNm278boiQ==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "expo-image-loader": "~5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/expo-json-utils": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
+      "integrity": "sha512-xjGfK9dL0B1wLnOqNkX0jM9p48Y0I5xEPzHude28LY67UmamUyAACkqhZGaPClyPNfdzczk7Ej6WaRMT3HfXvw==",
+      "license": "MIT"
     },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/expo-keep-awake": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-14.0.3.tgz",
+      "integrity": "sha512-6Jh94G6NvTZfuLnm2vwIpKe3GdOiVBuISl7FI8GqN0/9UOg9E0WXXp5cDcfAG8bn80RfgLJS8P7EPUGTZyOvhg==",
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
       }
     },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+    "node_modules/expo-linking": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-7.0.5.tgz",
+      "integrity": "sha512-3KptlJtcYDPWohk0MfJU75MJFh2ybavbtcSd84zEPfw9s1q3hjimw3sXnH03ZxP54kiEWldvKmmnGcVffBDB1g==",
+      "license": "MIT",
       "dependencies": {
-        "isobject": "^3.0.1"
+        "expo-constants": "~17.0.5",
+        "invariant": "^2.2.4"
       },
-      "engines": {
-        "node": ">=0.10.0"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    "node_modules/expo-location": {
+      "version": "18.0.10",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
+      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
     },
-    "node_modules/is-regex": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-      "dev": true,
+    "node_modules/expo-manifests": {
+      "version": "0.15.7",
+      "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.15.7.tgz",
+      "integrity": "sha512-IVzLcPamzUi4Br96xw6JPHaa1vjYupUnMqYyV1Mtd9VQojS5hJsf5VcVzbAMZE/cFGzWLZ1oJa6QXxYjN39Uww==",
+      "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@expo/config": "~10.0.10",
+        "expo-json-utils": "~0.14.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/expo-modules-autolinking": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.8.tgz",
+      "integrity": "sha512-DezgnEYFQYic8hKGhkbztBA3QUmSftjaNDIKNAtS2iGJmzCcNIkatjN2slFDSWjSTNo8gOvPQyMKfyHWFvLpOQ==",
+      "dependencies": {
+        "@expo/spawn-async": "^1.7.2",
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "fast-glob": "^3.2.5",
+        "find-up": "^5.0.0",
+        "fs-extra": "^9.1.0",
+        "require-from-string": "^2.0.2",
+        "resolve-from": "^5.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "bin": {
+        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
       }
     },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-      "dev": true,
+    "node_modules/expo-modules-autolinking/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=10"
+      }
+    },
+    "node_modules/expo-modules-autolinking/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+      "dependencies": {
+        "universalify": "^2.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+    "node_modules/expo-modules-autolinking/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/is-string": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-      "dev": true,
+    "node_modules/expo-modules-core": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-2.2.2.tgz",
+      "integrity": "sha512-SgjK86UD89gKAscRK3bdpn6Ojfs/KU4GujtuFx1wm4JaBjmXH4aakWkItkPlAV2pjIiHJHWQbENL9xjbw/Qr/g==",
+      "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
+        "invariant": "^2.2.4"
+      }
+    },
+    "node_modules/expo-pwa": {
+      "version": "0.0.126",
+      "resolved": "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.126.tgz",
+      "integrity": "sha512-9qb6aIY0awez4FTyIiNhqyekb6sKnbvODOFCDPg23PqpkvdhuzzDRtP/Avgippt8kqRAgPpFXmIp2LaAyH1/aw==",
+      "dependencies": {
+        "@expo/image-utils": "0.3.23",
+        "chalk": "^4.0.0",
+        "commander": "2.20.0",
+        "update-check": "1.5.3"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "expo-pwa": "build/cli.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/is-symbol": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-      "dev": true,
+    "node_modules/expo-pwa/node_modules/@expo/image-utils": {
+      "version": "0.3.23",
+      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.23.tgz",
+      "integrity": "sha512-nhUVvW0TrRE4jtWzHQl8TR4ox7kcmrc2I0itaeJGjxF5A54uk7avgA0wRt7jP1rdvqQo1Ke1lXyLYREdhN9tPw==",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "safe-regex-test": "^1.1.0"
+        "@expo/spawn-async": "1.5.0",
+        "chalk": "^4.0.0",
+        "fs-extra": "9.0.0",
+        "getenv": "^1.0.0",
+        "jimp-compact": "0.16.1",
+        "mime": "^2.4.4",
+        "node-fetch": "^2.6.0",
+        "parse-png": "^2.1.0",
+        "resolve-from": "^5.0.0",
+        "semver": "7.3.2",
+        "tempy": "0.3.0"
+      }
+    },
+    "node_modules/expo-pwa/node_modules/@expo/spawn-async": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.5.0.tgz",
+      "integrity": "sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==",
+      "dependencies": {
+        "cross-spawn": "^6.0.5"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/is-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-      "dev": true,
+    "node_modules/expo-pwa/node_modules/commander": {
+      "version": "2.20.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
+      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
+    },
+    "node_modules/expo-pwa/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
       "dependencies": {
-        "which-typed-array": "^1.1.16"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4.8"
       }
     },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "dev": true,
+    "node_modules/expo-pwa/node_modules/cross-spawn/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/expo-pwa/node_modules/crypto-random-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
+      "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-      "dev": true,
+    "node_modules/expo-pwa/node_modules/fs-extra": {
+      "version": "9.0.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
+      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
       "dependencies": {
-        "call-bound": "^1.0.3"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/is-weakset": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-      "dev": true,
+    "node_modules/expo-pwa/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
+        "universalify": "^2.0.0"
       },
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/expo-pwa/node_modules/jsonfile/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dependencies": {
-        "is-docker": "^2.0.0"
+    "node_modules/expo-pwa/node_modules/mime": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
+      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
+      "bin": {
+        "mime": "cli.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
-      "dev": true
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+    "node_modules/expo-pwa/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
+    "node_modules/expo-pwa/node_modules/semver": {
+      "version": "7.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
+      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
       }
     },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+    "node_modules/expo-pwa/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
+        "shebang-regex": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
+    "node_modules/expo-pwa/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/istanbul-lib-report/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/expo-pwa/node_modules/temp-dir": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
+      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+    "node_modules/expo-pwa/node_modules/tempy": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz",
+      "integrity": "sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==",
       "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
+        "temp-dir": "^1.0.0",
+        "type-fest": "^0.3.1",
+        "unique-string": "^1.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8"
       }
     },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/expo-pwa/node_modules/type-fest": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
+      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+    "node_modules/expo-pwa/node_modules/unique-string": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
+      "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
       "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
+        "crypto-random-string": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
-      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.6",
-        "get-proto": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "set-function-name": "^2.0.2"
-      },
+    "node_modules/expo-pwa/node_modules/universalify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
+      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+    "node_modules/expo-pwa/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "isexe": "^2.0.0"
       },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+    "node_modules/expo-router": {
+      "version": "4.0.17",
+      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-4.0.17.tgz",
+      "integrity": "sha512-8ybo6bVwdG1S9hafh9BTOjX1hpCgomdUvs6hKHMM01koo8mQ7zocH/+zxQeaMVDxGhboz2dO5GiDchWJ0OheRA==",
+      "license": "MIT",
       "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "@expo/metro-runtime": "4.0.1",
+        "@expo/server": "^0.5.1",
+        "@radix-ui/react-slot": "1.0.1",
+        "@react-navigation/bottom-tabs": "^7.2.0",
+        "@react-navigation/native": "^7.0.14",
+        "@react-navigation/native-stack": "^7.2.0",
+        "client-only": "^0.0.1",
+        "react-helmet-async": "^1.3.0",
+        "react-native-helmet-async": "2.0.4",
+        "react-native-is-edge-to-edge": "^1.1.6",
+        "schema-utils": "^4.0.1",
+        "semver": "~7.6.3",
+        "server-only": "^0.0.1"
       },
       "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+        "@react-navigation/drawer": "^7.1.1",
+        "expo": "*",
+        "expo-constants": "*",
+        "expo-linking": "*",
+        "react-native-reanimated": "*",
+        "react-native-safe-area-context": "*",
+        "react-native-screens": "*"
       },
       "peerDependenciesMeta": {
-        "node-notifier": {
+        "@react-navigation/drawer": {
+          "optional": true
+        },
+        "@testing-library/jest-native": {
+          "optional": true
+        },
+        "react-native-reanimated": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0"
+    "node_modules/expo-router/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
       }
     },
-    "node_modules/jest-changed-files/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+    "node_modules/expo-secure-store": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-14.0.1.tgz",
+      "integrity": "sha512-QUS+j4+UG4jRQalgnpmTvvrFnMVLqPiUZRzYPnG3+JrZ5kwVW2w6YS3WWerPoR7C6g3y/a2htRxRSylsDs+TaQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-changed-files/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
+    "node_modules/expo-splash-screen": {
+      "version": "0.29.22",
+      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.29.22.tgz",
+      "integrity": "sha512-f+bPpF06bqiuW1Fbrd3nxeaSsmTVTBEKEYe3epYt4IE6y4Ulli3qEUamMLlRQiDGuIXPU6zQlscpy2mdBUI5cA==",
+      "license": "MIT",
+      "dependencies": {
+        "@expo/prebuild-config": "^8.0.27"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/jest-changed-files/node_modules/is-stream": {
+    "node_modules/expo-status-bar": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-2.0.1.tgz",
+      "integrity": "sha512-AkIPX7jWHRPp83UBZ1iXtVvyr0g+DgBVvIXTtlmPtmUsm8Vq9Bb5IGj86PW8osuFlgoTVAg7HI/+Ok7yEYwiRg==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/jest-changed-files/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
+    "node_modules/expo-structured-headers": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-4.0.0.tgz",
+      "integrity": "sha512-uPiwZjWq3AdFGgY52+I2nGPrNa6izxAglymPXHUZLekZW290GqIUOk7MBNDD4sg4JwUbSi3gdxEurpEvuq+FSg==",
+      "license": "MIT"
     },
-    "node_modules/jest-changed-files/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+    "node_modules/expo-updates": {
+      "version": "0.27.1",
+      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.27.1.tgz",
+      "integrity": "sha512-1iCU/icvanYuJonHottHcTeYGxOAXcIOfeW0FXmELGLkliHpbXtFthmeiucIcdefgebIz3GxHk9CiTS0QrT7ZA==",
+      "license": "MIT",
       "dependencies": {
-        "path-key": "^3.0.0"
+        "@expo/code-signing-certificates": "0.0.5",
+        "@expo/config": "~10.0.10",
+        "@expo/config-plugins": "~9.0.16",
+        "@expo/spawn-async": "^1.7.2",
+        "arg": "4.1.0",
+        "chalk": "^4.1.2",
+        "expo-eas-client": "~0.13.3",
+        "expo-manifests": "~0.15.7",
+        "expo-structured-headers": "~4.0.0",
+        "expo-updates-interface": "~1.0.0",
+        "fast-glob": "^3.3.2",
+        "fbemitter": "^3.0.0",
+        "ignore": "^5.3.1",
+        "resolve-from": "^5.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "expo-updates": "bin/cli.js"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
       }
     },
-    "node_modules/jest-changed-files/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
+    "node_modules/expo-updates-interface": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-1.0.0.tgz",
+      "integrity": "sha512-93oWtvULJOj+Pp+N/lpTcFfuREX1wNeHtp7Lwn8EbzYYmdn37MvZU3TPW2tYYCZuhzmKEXnUblYcruYoDu7IrQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-updates/node_modules/arg": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
+      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
+      "license": "MIT"
+    },
+    "node_modules/exponential-backoff": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
+    },
+    "node_modules/express": {
+      "version": "4.21.2",
+      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
+      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
+      "dependencies": {
+        "accepts": "~1.3.8",
+        "array-flatten": "1.1.1",
+        "body-parser": "1.20.3",
+        "content-disposition": "0.5.4",
+        "content-type": "~1.0.4",
+        "cookie": "0.7.1",
+        "cookie-signature": "1.0.6",
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "finalhandler": "1.3.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "merge-descriptors": "1.0.3",
+        "methods": "~1.1.2",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "path-to-regexp": "0.1.12",
+        "proxy-addr": "~2.0.7",
+        "qs": "6.13.0",
+        "range-parser": "~1.2.1",
+        "safe-buffer": "5.2.1",
+        "send": "0.19.0",
+        "serve-static": "1.16.2",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "type-is": "~1.6.18",
+        "utils-merge": "1.0.1",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.10.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "type": "opencollective",
+        "url": "https://opencollective.com/express"
       }
     },
-    "node_modules/jest-changed-files/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+    "node_modules/express/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
+    "node_modules/express/node_modules/debug/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/express/node_modules/encodeurl": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
+      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+    "node_modules/express/node_modules/finalhandler": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
+      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
+        "debug": "2.6.9",
+        "encodeurl": "~2.0.0",
+        "escape-html": "~1.0.3",
+        "on-finished": "2.4.1",
+        "parseurl": "~1.3.3",
+        "statuses": "2.0.1",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-config/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/express/node_modules/on-finished": {
+      "version": "2.4.1",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
+      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-config/node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+    "node_modules/express/node_modules/send": {
+      "version": "0.19.0",
+      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
+      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
       "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
+        "debug": "2.6.9",
+        "depd": "2.0.0",
+        "destroy": "1.2.0",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "etag": "~1.8.1",
+        "fresh": "0.5.2",
+        "http-errors": "2.0.0",
+        "mime": "1.6.0",
+        "ms": "2.1.3",
+        "on-finished": "2.4.1",
+        "range-parser": "~1.2.1",
+        "statuses": "2.0.1"
       },
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/jest-config/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+    "node_modules/express/node_modules/send/node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
+    "node_modules/express/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
+    },
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dependencies": {
-        "detect-newline": "^3.0.0"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
+    },
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
+    },
+    "node_modules/fast-loops": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.4.tgz",
+      "integrity": "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="
+    },
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
+    },
+    "node_modules/fastq": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+    "node_modules/faye-websocket": {
+      "version": "0.11.4",
+      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
+      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/jsdom": "^20.0.0",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jsdom": "^20.0.0"
+        "websocket-driver": ">=0.5.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dependencies": {
+        "bser": "2.1.1"
+      }
+    },
+    "node_modules/fbemitter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
+      "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
+      "dependencies": {
+        "fbjs": "^3.0.0"
+      }
+    },
+    "node_modules/fbjs": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
+      "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
+      "dependencies": {
+        "cross-fetch": "^3.1.5",
+        "fbjs-css-vars": "^1.0.0",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^1.0.35"
+      }
+    },
+    "node_modules/fbjs-css-vars": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
+      "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
+    },
+    "node_modules/fdir": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "dev": true,
       "peerDependencies": {
-        "canvas": "^2.5.0"
+        "picomatch": "^3 || ^4"
       },
       "peerDependenciesMeta": {
-        "canvas": {
+        "picomatch": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+    "node_modules/fetch-retry": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
+      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
+    },
+    "node_modules/file-entry-cache": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "dev": true,
       "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/jest-expo": {
-      "version": "52.0.5",
-      "resolved": "https://registry.npmjs.org/jest-expo/-/jest-expo-52.0.5.tgz",
-      "integrity": "sha512-2jjdE81tWxH5PPe5SGR9rxLZbPtuM7ihEL+43xlJIjgxcplsMpFV9Nb8r5h3IpG+aVDjMiQXqF25n9dqqD09OQ==",
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
       "dependencies": {
-        "@expo/config": "~10.0.10",
-        "@expo/json-file": "^9.0.2",
-        "@jest/create-cache-key-function": "^29.2.1",
-        "@jest/globals": "^29.2.1",
-        "babel-jest": "^29.2.1",
-        "fbemitter": "^3.0.0",
-        "find-up": "^5.0.0",
-        "jest-environment-jsdom": "^29.2.1",
-        "jest-snapshot": "^29.2.1",
-        "jest-watch-select-projects": "^2.0.0",
-        "jest-watch-typeahead": "2.2.1",
-        "json5": "^2.2.3",
-        "lodash": "^4.17.19",
-        "react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
-        "react-test-renderer": "18.3.1",
-        "server-only": "^0.0.1",
-        "stacktrace-js": "^2.0.2"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
+        "to-regex-range": "^5.0.1"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/jest-expo/node_modules/react": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-SMgWGY//7nO7F3HMuBfmC15Cr4vTe2tlpSCATfnz/wymSftDOKUqc+0smjRhcUeCFCc1zhOAWJ+N//U5CrmOzQ==",
-      "peer": true,
+    "node_modules/filter-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
+      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
+      "license": "MIT",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/jest-expo/node_modules/react-dom": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==",
-      "peer": true,
-      "dependencies": {
-        "scheduler": "0.25.0-rc-6230622a1a-20240610"
-      },
-      "peerDependencies": {
-        "react": "19.0.0-rc-6230622a1a-20240610"
-      }
-    },
-    "node_modules/jest-expo/node_modules/react-server-dom-webpack": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-nr+IsOVD07QdeCr4BLvR5TALfLaZLi9AIaoa6vXymBc051iDPWedJujYYrjRJy5+9jp9oCx3G8Tt/Bs//TckJw==",
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dependencies": {
-        "acorn-loose": "^8.3.0",
-        "neo-async": "^2.6.1"
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "react": "19.0.0-rc-6230622a1a-20240610",
-        "react-dom": "19.0.0-rc-6230622a1a-20240610",
-        "webpack": "^5.59.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/jest-expo/node_modules/scheduler": {
-      "version": "0.25.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==",
-      "peer": true
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
     },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/find-babel-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.1.2.tgz",
+      "integrity": "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "json5": "^2.2.3"
       }
     },
-    "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+    "node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+    "node_modules/find-yarn-workspace-root": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
+      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "micromatch": "^4.0.2"
       }
     },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "dev": true,
       "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=16"
       }
     },
-    "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-util": "^29.7.0"
-      },
+    "node_modules/flatted": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true
+    },
+    "node_modules/flow-enums-runtime": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz",
+      "integrity": "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="
+    },
+    "node_modules/flow-parser": {
+      "version": "0.261.2",
+      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.261.2.tgz",
+      "integrity": "sha512-RtunoakA3YjtpAxPSOBVW6lmP5NYmETwkpAfNkdr8Ovf86ENkbD3mtPWnswFTIUtRvjwv0i8ZSkHK+AzsUg1JA==",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
+        "node": ">=4.0"
       },
       "peerDependenciesMeta": {
-        "jest-resolve": {
+        "debug": {
           "optional": true
         }
       }
     },
-    "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
+    "node_modules/fontfaceobserver": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz",
+      "integrity": "sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg=="
     },
-    "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+    "node_modules/for-each": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
       "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
+        "is-callable": "^1.2.7"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+    "node_modules/foreach": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
+      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg=="
+    },
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
       "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+    "node_modules/form-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
+      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
       "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.35"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 6"
       }
     },
-    "node_modules/jest-runner/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+    "node_modules/forwarded": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
+      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/jest-runner/node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
+    "node_modules/freeport-async": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz",
+      "integrity": "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/jest-runtime/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+    "node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/fs-monkey": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
+      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg=="
     },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
+    },
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
       }
     },
-    "node_modules/jest-util/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
       "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-watch-select-projects": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-select-projects/-/jest-watch-select-projects-2.0.0.tgz",
-      "integrity": "sha512-j00nW4dXc2NiCW6znXgFLF9g8PJ0zP25cpQ1xRro/HU2GBfZQFZD0SoXnAlaoKkIY4MlfTMkKGbNXFpvCdjl1w==",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^3.0.0",
-        "prompts": "^2.2.1"
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-watch-select-projects/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+    "node_modules/fwd-stream": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz",
+      "integrity": "sha512-q2qaK2B38W07wfPSQDKMiKOD5Nzv2XyuvQlrmh1q0pxyHNanKHq8lwQ6n9zHucAwA5EbzRJKEgds2orn88rYTg==",
       "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "readable-stream": "~1.0.26-4"
       }
     },
-    "node_modules/jest-watch-typeahead": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-2.2.1.tgz",
-      "integrity": "sha512-jYpYmUnTzysmVnwq49TAxlmtOAwp8QIqvZyoofQFn8fiWhEDZj33ZXzg3JA4nGnzWFm1hbWf3ADpteUokvXgFA==",
+    "node_modules/fwd-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+    },
+    "node_modules/fwd-stream/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
       "dependencies": {
-        "ansi-escapes": "^6.0.0",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^29.0.0",
-        "jest-watcher": "^29.0.0",
-        "slash": "^5.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
-      "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
-      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "engines": {
-        "node": ">=12.20"
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
-        "node": ">=12.20"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/get-port": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
       "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "pump": "^3.0.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/get-symbol-description": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
       "dependencies": {
-        "has-flag": "^4.0.0"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jimp-compact": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz",
-      "integrity": "sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="
-    },
-    "node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "bin": {
-        "jiti": "bin/jiti.js"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/join-component": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz",
-      "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+    "node_modules/get-tsconfig": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
+      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
+      "dev": true,
       "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
+        "resolve-pkg-maps": "^1.0.0"
       },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
-    "node_modules/jsc-android": {
-      "version": "250231.0.0",
-      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
-      "integrity": "sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw=="
-    },
-    "node_modules/jsc-safe-url": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
-      "integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
+    "node_modules/getenv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
+      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==",
+      "engines": {
+        "node": ">=6"
+      }
     },
-    "node_modules/jscodeshift": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-      "integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dependencies": {
-        "@babel/core": "^7.13.16",
-        "@babel/parser": "^7.13.16",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/preset-flow": "^7.13.13",
-        "@babel/preset-typescript": "^7.13.0",
-        "@babel/register": "^7.13.16",
-        "babel-core": "^7.0.0-bridge.0",
-        "chalk": "^4.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.21.0",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
       "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
+        "glob": "dist/esm/bin.mjs"
       },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jsdom": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
-      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
       "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.1",
-        "acorn-globals": "^7.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.2",
-        "decimal.js": "^10.4.2",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
-        "parse5": "^7.1.1",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0",
-        "ws": "^8.11.0",
-        "xml-name-validator": "^4.0.0"
+        "is-glob": "^4.0.1"
       },
       "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
+        "node": ">= 6"
       }
     },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dependencies": {
-        "punycode": "^2.1.1"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+    "node_modules/globals": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
+      "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
+      "dev": true,
       "engines": {
-        "node": ">=12"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
       "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
+      "dependencies": {
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
     },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
       "dev": true
     },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
+    "node_modules/graphql": {
+      "version": "15.8.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz",
+      "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==",
+      "peer": true,
+      "engines": {
+        "node": ">= 10.x"
+      }
     },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "bin": {
-        "json5": "lib/cli.js"
+    "node_modules/graphql-tag": {
+      "version": "2.12.6",
+      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
+      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
+      "peer": true,
+      "dependencies": {
+        "tslib": "^2.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "peerDependencies": {
+        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
       }
     },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
+    "node_modules/handle-thing": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
+      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
     },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
+    "node_modules/has-bigints": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
+      "engines": {
+        "node": ">= 0.4"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=8"
       }
     },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
       "dependencies": {
-        "json-buffer": "3.0.1"
+        "es-define-property": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+    "node_modules/has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
+      "dependencies": {
+        "has-symbols": "^1.0.3"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
       "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
+        "function-bind": "^1.1.2"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/lighthouse-logger": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
-      "integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
-      "dependencies": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
+    "node_modules/he": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
+      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
+      "bin": {
+        "he": "bin/he"
       }
     },
-    "node_modules/lighthouse-logger/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/hermes-estree": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
+      "integrity": "sha512-eT5MU3f5aVhTqsfIReZ6n41X5sYn4IdQL0nvz6yO+MMlPxw49aSARHLg/MSehQftyjnrE8X6bYregzSumqc6cg=="
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.23.1.tgz",
+      "integrity": "sha512-oxl5h2DkFW83hT4DAUJorpah8ou4yvmweUzLJmmr6YV2cezduCdlil1AvU/a/xSsAFo4WUcNA4GoV5Bvq6JffA==",
       "dependencies": {
-        "ms": "2.0.0"
+        "hermes-estree": "0.23.1"
       }
     },
-    "node_modules/lighthouse-logger/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/lightningcss": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz",
-      "integrity": "sha512-8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ==",
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
       "dependencies": {
-        "detect-libc": "^1.0.3"
+        "react-is": "^16.7.0"
+      }
+    },
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
+    "node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
+      "dependencies": {
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.27.0",
-        "lightningcss-darwin-x64": "1.27.0",
-        "lightningcss-freebsd-x64": "1.27.0",
-        "lightningcss-linux-arm-gnueabihf": "1.27.0",
-        "lightningcss-linux-arm64-gnu": "1.27.0",
-        "lightningcss-linux-arm64-musl": "1.27.0",
-        "lightningcss-linux-x64-gnu": "1.27.0",
-        "lightningcss-linux-x64-musl": "1.27.0",
-        "lightningcss-win32-arm64-msvc": "1.27.0",
-        "lightningcss-win32-x64-msvc": "1.27.0"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz",
-      "integrity": "sha512-Gl/lqIXY+d+ySmMbgDf0pgaWSqrWYxVHoc88q+Vhf2YNzZ8DwoRzGt5NZDVqqIW5ScpSnmmjcgXP87Dn2ylSSQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/hpack.js": {
+      "version": "2.1.6",
+      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
+      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
+      "dependencies": {
+        "inherits": "^2.0.1",
+        "obuf": "^1.0.0",
+        "readable-stream": "^2.0.1",
+        "wbuf": "^1.1.0"
       }
     },
-    "node_modules/lightningcss-darwin-x64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz",
-      "integrity": "sha512-0+mZa54IlcNAoQS9E0+niovhyjjQWEMrwW0p2sSdLRhLDc8LMQ/b67z7+B5q4VmjYCMSfnFi3djAAQFIDuj/Tg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/hpack.js/node_modules/isarray": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
+      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
+    },
+    "node_modules/hpack.js/node_modules/readable-stream": {
+      "version": "2.3.8",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
+      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.3",
+        "isarray": "~1.0.0",
+        "process-nextick-args": "~2.0.0",
+        "safe-buffer": "~5.1.1",
+        "string_decoder": "~1.1.1",
+        "util-deprecate": "~1.0.1"
+      }
+    },
+    "node_modules/hpack.js/node_modules/safe-buffer": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    },
+    "node_modules/hpack.js/node_modules/string_decoder": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
+      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+      "dependencies": {
+        "safe-buffer": "~5.1.0"
+      }
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
+      "dependencies": {
+        "whatwg-encoding": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=12"
+      }
+    },
+    "node_modules/html-entities": {
+      "version": "2.6.0",
+      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
+      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/mdevils"
+        },
+        {
+          "type": "patreon",
+          "url": "https://patreon.com/mdevils"
+        }
+      ]
+    },
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/html-minifier-terser": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
+      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
+      "dependencies": {
+        "camel-case": "^4.1.2",
+        "clean-css": "^5.2.2",
+        "commander": "^8.3.0",
+        "he": "^1.2.0",
+        "param-case": "^3.0.4",
+        "relateurl": "^0.2.7",
+        "terser": "^5.10.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "bin": {
+        "html-minifier-terser": "cli.js"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz",
-      "integrity": "sha512-n1sEf85fePoU2aDN2PzYjoI8gbBqnmLGEhKq7q0DKLj0UTVmOTwDC7PtLcy/zFxzASTSBlVQYJUhwIStQMIpRA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
+    "node_modules/html-minifier-terser/node_modules/commander": {
+      "version": "8.3.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
+      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
       "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "node": ">= 12"
       }
     },
-    "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz",
-      "integrity": "sha512-MUMRmtdRkOkd5z3h986HOuNBD1c2lq2BSQA1Jg88d9I7bmPGx08bwGcnB75dvr17CwxjxD6XPi3Qh8ArmKFqCA==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/html-webpack-plugin": {
+      "version": "5.6.3",
+      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
+      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
+      "dependencies": {
+        "@types/html-minifier-terser": "^6.0.0",
+        "html-minifier-terser": "^6.0.2",
+        "lodash": "^4.17.21",
+        "pretty-error": "^4.0.0",
+        "tapable": "^2.0.0"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=10.13.0"
       },
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://opencollective.com/html-webpack-plugin"
+      },
+      "peerDependencies": {
+        "@rspack/core": "0.x || 1.x",
+        "webpack": "^5.20.0"
+      },
+      "peerDependenciesMeta": {
+        "@rspack/core": {
+          "optional": true
+        },
+        "webpack": {
+          "optional": true
+        }
       }
     },
-    "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz",
-      "integrity": "sha512-cPsxo1QEWq2sfKkSq2Bq5feQDHdUEwgtA9KaB27J5AX22+l4l0ptgjMZZtYtUnteBofjee+0oW1wQ1guv04a7A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
+    "node_modules/htmlparser2": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
+      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
+      "funding": [
+        "https://github.com/fb55/htmlparser2?sponsor=1",
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
       ],
-      "engines": {
-        "node": ">= 12.0.0"
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.0.0",
+        "domutils": "^2.5.2",
+        "entities": "^2.0.0"
+      }
+    },
+    "node_modules/htmlparser2/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz",
-      "integrity": "sha512-rCGBm2ax7kQ9pBSeITfCW9XSVF69VX+fm5DIpvDZQl4NnQoMQyRwhZQm9pd59m8leZ1IesRqWk2v/DntMo26lg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
+    "node_modules/htmlparser2/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz",
-      "integrity": "sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
+    "node_modules/htmlparser2/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz",
-      "integrity": "sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
+    "node_modules/htmlparser2/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz",
-      "integrity": "sha512-/wXegPS1hnhkeG4OXQKEMQeJd48RDC3qdh+OA8pCuOPCyvnm/yEayrJdJVqzBsqpy1aJklRCVxscpFur80o6iQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/http-deceiver": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
+      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
+      "dependencies": {
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/http-parser-js": {
+      "version": "0.5.10",
+      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
+      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA=="
+    },
+    "node_modules/http-proxy": {
+      "version": "1.18.1",
+      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
+      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
+      "dependencies": {
+        "eventemitter3": "^4.0.0",
+        "follow-redirects": "^1.0.0",
+        "requires-port": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
+      "dependencies": {
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/http-proxy-middleware": {
+      "version": "2.0.9",
+      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
+      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
+      "dependencies": {
+        "@types/http-proxy": "^1.17.8",
+        "http-proxy": "^1.18.1",
+        "is-glob": "^4.0.1",
+        "is-plain-obj": "^3.0.0",
+        "micromatch": "^4.0.2"
+      },
+      "engines": {
+        "node": ">=12.0.0"
+      },
+      "peerDependencies": {
+        "@types/express": "^4.17.13"
+      },
+      "peerDependenciesMeta": {
+        "@types/express": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/https-browserify": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
+      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ=="
+    },
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
+      "dependencies": {
+        "agent-base": "6",
+        "debug": "4"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
+      "engines": {
+        "node": ">=10.17.0"
+      }
+    },
+    "node_modules/husky": {
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
+      "dev": true,
+      "bin": {
+        "husky": "bin.js"
+      },
+      "engines": {
+        "node": ">=18"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://github.com/sponsors/typicode"
       }
     },
-    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz",
-      "integrity": "sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/hyphenate-style-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
+      "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
+      },
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/icss-utils": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
+      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
+      "engines": {
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
+      }
+    },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
+    "node_modules/image-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
+      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
+      "dependencies": {
+        "queue": "6.0.2"
+      },
+      "bin": {
+        "image-size": "bin/image-size.js"
       },
+      "engines": {
+        "node": ">=16.x"
+      }
+    },
+    "node_modules/immer": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+      "license": "MIT",
       "funding": {
         "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+        "url": "https://opencollective.com/immer"
       }
     },
-    "node_modules/lilconfig": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+    "node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
+      "dependencies": {
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
+      },
       "engines": {
-        "node": ">=14"
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
+      "engines": {
+        "node": ">=8"
       },
       "funding": {
-        "url": "https://github.com/sponsors/antonk52"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
+      "dependencies": {
+        "p-limit": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
+      "dependencies": {
+        "find-up": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
+      "engines": {
+        "node": ">=0.8.19"
+      }
+    },
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/indexof": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
+      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
+    },
+    "node_modules/infer-owner": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
+      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
+      "peer": true
+    },
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
+      "dependencies": {
+        "once": "^1.3.0",
+        "wrappy": "1"
+      }
+    },
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
+    },
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
+    },
+    "node_modules/inline-style-prefixer": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz",
+      "integrity": "sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==",
+      "dependencies": {
+        "css-in-js-utils": "^3.1.0",
+        "fast-loops": "^1.1.3"
+      }
+    },
+    "node_modules/internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dependencies": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
+      "dependencies": {
+        "loose-envify": "^1.0.0"
+      }
+    },
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz",
+      "integrity": "sha512-ajQCouIvkcSnl2iRdK70Jug9mohIHVX9uKpoWnl115ov0R5mzBvRrXxrnHbsA+8AdwCwc/sfw7HXmd4I5EJBdQ==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
+    },
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dependencies": {
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dependencies": {
+        "has-bigints": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
+      "dependencies": {
+        "binary-extensions": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-boolean-object": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
+    },
+    "node_modules/is-bun-module": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
+      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
+      "dev": true,
+      "dependencies": {
+        "semver": "^7.6.3"
+      }
+    },
+    "node_modules/is-bun-module/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-date-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
+      "bin": {
+        "is-docker": "cli.js"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
+      "dependencies": {
+        "is-extglob": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-invalid-path": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz",
+      "integrity": "sha512-aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ==",
+      "peer": true,
+      "dependencies": {
+        "is-glob": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-invalid-path/node_modules/is-extglob": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
+      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-invalid-path/node_modules/is-glob": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
+      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
+      "peer": true,
+      "dependencies": {
+        "is-extglob": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
+      "engines": {
+        "node": ">=0.12.0"
+      }
+    },
+    "node_modules/is-number-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-object": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz",
+      "integrity": "sha512-GkfZZlIZtpkFrqyAXPQSRBMsaHAw+CgoKe2HXAkjd/sfoI9+hS8PT4wg2rJxdQyUKr7N2vHJbg7/jQtE5l5vBQ=="
+    },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
+      "dependencies": {
+        "is-path-inside": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+      "dependencies": {
+        "path-is-inside": "^1.0.2"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/is-plain-obj": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
+      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-root": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
+      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
+      "peer": true,
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-symbol": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dependencies": {
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dependencies": {
+        "which-typed-array": "^1.1.16"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-valid-path": {
+      "version": "0.1.1",
+      "resolved": "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz",
+      "integrity": "sha512-+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A==",
+      "peer": true,
+      "dependencies": {
+        "is-invalid-path": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dependencies": {
+        "call-bound": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
+      "dependencies": {
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
+    },
+    "node_modules/isexe": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/isomorphic-fetch": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
+      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
+      "dependencies": {
+        "node-fetch": "^2.6.1",
+        "whatwg-fetch": "^3.4.1"
+      }
+    },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
+      "dependencies": {
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
+      "dependencies": {
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
+      "dependencies": {
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
+      "dependencies": {
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/iterator.prototype": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+      "dev": true,
+      "dependencies": {
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
+      "dependencies": {
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
+      }
+    },
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
+      "dependencies": {
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-changed-files/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
+      },
+      "peerDependenciesMeta": {
+        "node-notifier": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-config/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-config/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
+      "dependencies": {
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-config/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
+      "dependencies": {
+        "detect-newline": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-expo": {
+      "version": "52.0.5",
+      "resolved": "https://registry.npmjs.org/jest-expo/-/jest-expo-52.0.5.tgz",
+      "integrity": "sha512-2jjdE81tWxH5PPe5SGR9rxLZbPtuM7ihEL+43xlJIjgxcplsMpFV9Nb8r5h3IpG+aVDjMiQXqF25n9dqqD09OQ==",
+      "dependencies": {
+        "@expo/config": "~10.0.10",
+        "@expo/json-file": "^9.0.2",
+        "@jest/create-cache-key-function": "^29.2.1",
+        "@jest/globals": "^29.2.1",
+        "babel-jest": "^29.2.1",
+        "fbemitter": "^3.0.0",
+        "find-up": "^5.0.0",
+        "jest-environment-jsdom": "^29.2.1",
+        "jest-snapshot": "^29.2.1",
+        "jest-watch-select-projects": "^2.0.0",
+        "jest-watch-typeahead": "2.2.1",
+        "json5": "^2.2.3",
+        "lodash": "^4.17.19",
+        "react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
+        "react-test-renderer": "18.3.1",
+        "server-only": "^0.0.1",
+        "stacktrace-js": "^2.0.2"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
+      }
+    },
+    "node_modules/jest-expo/node_modules/react": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-SMgWGY//7nO7F3HMuBfmC15Cr4vTe2tlpSCATfnz/wymSftDOKUqc+0smjRhcUeCFCc1zhOAWJ+N//U5CrmOzQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-expo/node_modules/react-dom": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==",
+      "peer": true,
+      "dependencies": {
+        "scheduler": "0.25.0-rc-6230622a1a-20240610"
+      },
+      "peerDependencies": {
+        "react": "19.0.0-rc-6230622a1a-20240610"
+      }
+    },
+    "node_modules/jest-expo/node_modules/react-server-dom-webpack": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-nr+IsOVD07QdeCr4BLvR5TALfLaZLi9AIaoa6vXymBc051iDPWedJujYYrjRJy5+9jp9oCx3G8Tt/Bs//TckJw==",
+      "dependencies": {
+        "acorn-loose": "^8.3.0",
+        "neo-async": "^2.6.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      },
+      "peerDependencies": {
+        "react": "19.0.0-rc-6230622a1a-20240610",
+        "react-dom": "19.0.0-rc-6230622a1a-20240610",
+        "webpack": "^5.59.0"
+      }
+    },
+    "node_modules/jest-expo/node_modules/scheduler": {
+      "version": "0.25.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==",
+      "peer": true
+    },
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
+      }
+    },
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
+      "dependencies": {
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
+      "engines": {
+        "node": ">=6"
+      },
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
+      "dependencies": {
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
+      "dependencies": {
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
+    },
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-runtime/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "dependencies": {
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
+      },
+      "engines": {
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      }
+    },
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
+      "dependencies": {
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
+      "engines": {
+        "node": ">=10"
+      }
+    },
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-select-projects": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-select-projects/-/jest-watch-select-projects-2.0.0.tgz",
+      "integrity": "sha512-j00nW4dXc2NiCW6znXgFLF9g8PJ0zP25cpQ1xRro/HU2GBfZQFZD0SoXnAlaoKkIY4MlfTMkKGbNXFpvCdjl1w==",
+      "dependencies": {
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^3.0.0",
+        "prompts": "^2.2.1"
+      }
+    },
+    "node_modules/jest-watch-select-projects/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
+      "dependencies": {
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/jest-watch-typeahead": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-2.2.1.tgz",
+      "integrity": "sha512-jYpYmUnTzysmVnwq49TAxlmtOAwp8QIqvZyoofQFn8fiWhEDZj33ZXzg3JA4nGnzWFm1hbWf3ADpteUokvXgFA==",
+      "dependencies": {
+        "ansi-escapes": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^29.0.0",
+        "jest-watcher": "^29.0.0",
+        "slash": "^5.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
+      "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
+      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
+      "engines": {
+        "node": ">=12.20"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
+      "dependencies": {
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
+      "dependencies": {
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
+    },
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "dependencies": {
+        "has-flag": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
+      }
+    },
+    "node_modules/jimp-compact": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz",
+      "integrity": "sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="
+    },
+    "node_modules/jiti": {
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "bin": {
+        "jiti": "bin/jiti.js"
+      }
+    },
+    "node_modules/join-component": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz",
+      "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="
+    },
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
+    },
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
+      }
+    },
+    "node_modules/jsc-android": {
+      "version": "250231.0.0",
+      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
+      "integrity": "sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw=="
+    },
+    "node_modules/jsc-safe-url": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
+      "integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
+    },
+    "node_modules/jscodeshift": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
+      "integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
+      "dependencies": {
+        "@babel/core": "^7.13.16",
+        "@babel/parser": "^7.13.16",
+        "@babel/plugin-proposal-class-properties": "^7.13.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
+        "@babel/preset-flow": "^7.13.13",
+        "@babel/preset-typescript": "^7.13.0",
+        "@babel/register": "^7.13.16",
+        "babel-core": "^7.0.0-bridge.0",
+        "chalk": "^4.1.2",
+        "flow-parser": "0.*",
+        "graceful-fs": "^4.2.4",
+        "micromatch": "^4.0.4",
+        "neo-async": "^2.5.0",
+        "node-dir": "^0.1.17",
+        "recast": "^0.21.0",
+        "temp": "^0.8.4",
+        "write-file-atomic": "^2.3.0"
+      },
+      "bin": {
+        "jscodeshift": "bin/jscodeshift.js"
+      },
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
+      }
+    },
+    "node_modules/jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
+      "dependencies": {
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
+      "dependencies": {
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/jsdom/node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+      "dependencies": {
+        "punycode": "^2.1.1"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsdom/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsdom/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+      "dependencies": {
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
+      },
+      "engines": {
+        "node": ">=12"
+      }
+    },
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
+    },
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
+    },
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
+    },
+    "node_modules/json-schema-deref-sync": {
+      "version": "0.13.0",
+      "resolved": "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.13.0.tgz",
+      "integrity": "sha512-YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg==",
+      "peer": true,
+      "dependencies": {
+        "clone": "^2.1.2",
+        "dag-map": "~1.0.0",
+        "is-valid-path": "^0.1.1",
+        "lodash": "^4.17.13",
+        "md5": "~2.2.0",
+        "memory-cache": "~0.2.0",
+        "traverse": "~0.6.6",
+        "valid-url": "~1.0.9"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/json-schema-deref-sync/node_modules/clone": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
+      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.8"
+      }
+    },
+    "node_modules/json-schema-deref-sync/node_modules/md5": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
+      "integrity": "sha512-PlGG4z5mBANDGCKsYQe0CaUYHdZYZt8ZPZLmEt+Urf0W4GlpTX4HescwHU+dc9+Z/G/vZKYZYFrwgm9VxK6QOQ==",
+      "peer": true,
+      "dependencies": {
+        "charenc": "~0.0.1",
+        "crypt": "~0.0.1",
+        "is-buffer": "~1.1.1"
+      }
+    },
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
+      }
+    },
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
+      "dependencies": {
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
+      },
+      "engines": {
+        "node": ">=4.0"
+      }
+    },
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
+      "dependencies": {
+        "json-buffer": "3.0.1"
+      }
+    },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/launch-editor": {
+      "version": "2.10.0",
+      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
+      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
+      "dependencies": {
+        "picocolors": "^1.0.0",
+        "shell-quote": "^1.8.1"
+      }
+    },
+    "node_modules/level-blobs": {
+      "version": "0.1.7",
+      "resolved": "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz",
+      "integrity": "sha512-n0iYYCGozLd36m/Pzm206+brIgXP8mxPZazZ6ZvgKr+8YwOZ8/PPpYC5zMUu2qFygRN8RO6WC/HH3XWMW7RMVg==",
+      "dependencies": {
+        "level-peek": "1.0.6",
+        "once": "^1.3.0",
+        "readable-stream": "^1.0.26-4"
+      }
+    },
+    "node_modules/level-filesystem": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz",
+      "integrity": "sha512-PhXDuCNYpngpxp3jwMT9AYBMgOvB6zxj3DeuIywNKmZqFj2djj9XfT2XDVslfqmo0Ip79cAd3SBy3FsfOZPJ1g==",
+      "dependencies": {
+        "concat-stream": "^1.4.4",
+        "errno": "^0.1.1",
+        "fwd-stream": "^1.0.4",
+        "level-blobs": "^0.1.7",
+        "level-peek": "^1.0.6",
+        "level-sublevel": "^5.2.0",
+        "octal": "^1.0.0",
+        "once": "^1.3.0",
+        "xtend": "^2.2.0"
+      }
+    },
+    "node_modules/level-filesystem/node_modules/xtend": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz",
+      "integrity": "sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/level-fix-range": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz",
+      "integrity": "sha512-9llaVn6uqBiSlBP+wKiIEoBa01FwEISFgHSZiyec2S0KpyLUkGR4afW/FCZ/X8y+QJvzS0u4PGOlZDdh1/1avQ=="
+    },
+    "node_modules/level-hooks": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz",
+      "integrity": "sha512-fxLNny/vL/G4PnkLhWsbHnEaRi+A/k8r5EH/M77npZwYL62RHi2fV0S824z3QdpAk6VTgisJwIRywzBHLK4ZVA==",
+      "dependencies": {
+        "string-range": "~1.2"
+      }
+    },
+    "node_modules/level-peek": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz",
+      "integrity": "sha512-TKEzH5TxROTjQxWMczt9sizVgnmJ4F3hotBI48xCTYvOKd/4gA/uY0XjKkhJFo6BMic8Tqjf6jFMLWeg3MAbqQ==",
+      "dependencies": {
+        "level-fix-range": "~1.0.2"
+      }
+    },
+    "node_modules/level-sublevel": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz",
+      "integrity": "sha512-tO8jrFp+QZYrxx/Gnmjawuh1UBiifpvKNAcm4KCogesWr1Nm2+ckARitf+Oo7xg4OHqMW76eAqQ204BoIlscjA==",
+      "dependencies": {
+        "level-fix-range": "2.0",
+        "level-hooks": ">=4.4.0 <5",
+        "string-range": "~1.2.1",
+        "xtend": "~2.0.4"
+      }
+    },
+    "node_modules/level-sublevel/node_modules/clone": {
+      "version": "0.1.19",
+      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
+      "integrity": "sha512-IO78I0y6JcSpEPHzK4obKdsL7E7oLdRVDVOLwr2Hkbjsb+Eoz0dxW6tef0WizoKu0gLC4oZSZuEF4U2K6w1WQw==",
+      "engines": {
+        "node": "*"
+      }
+    },
+    "node_modules/level-sublevel/node_modules/level-fix-range": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz",
+      "integrity": "sha512-WrLfGWgwWbYPrHsYzJau+5+te89dUbENBg3/lsxOs4p2tYOhCHjbgXxBAj4DFqp3k/XBwitcRXoCh8RoCogASA==",
+      "dependencies": {
+        "clone": "~0.1.9"
+      }
+    },
+    "node_modules/level-sublevel/node_modules/object-keys": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz",
+      "integrity": "sha512-XODjdR2pBh/1qrjPcbSeSgEtKbYo7LqYNq64/TPuCf7j9SfDD3i21yatKoIy39yIWNvVM59iutfQQpCv1RfFzA==",
+      "deprecated": "Please update to the latest object-keys",
+      "dependencies": {
+        "foreach": "~2.0.1",
+        "indexof": "~0.0.1",
+        "is": "~0.2.6"
+      }
+    },
+    "node_modules/level-sublevel/node_modules/xtend": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz",
+      "integrity": "sha512-fOZg4ECOlrMl+A6Msr7EIFcON1L26mb4NY5rurSkOex/TWhazOrg6eXD/B0XkuiYcYhQDWLXzQxLMVJ7LXwokg==",
+      "dependencies": {
+        "is-object": "~0.1.2",
+        "object-keys": "~0.2.0"
+      },
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/levelup": {
+      "version": "0.18.6",
+      "resolved": "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz",
+      "integrity": "sha512-uB0auyRqIVXx+hrpIUtol4VAPhLRcnxcOsd2i2m6rbFIDarO5dnrupLOStYYpEcu8ZT087Z9HEuYw1wjr6RL6Q==",
+      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
+      "dependencies": {
+        "bl": "~0.8.1",
+        "deferred-leveldown": "~0.2.0",
+        "errno": "~0.1.1",
+        "prr": "~0.0.0",
+        "readable-stream": "~1.0.26",
+        "semver": "~2.3.1",
+        "xtend": "~3.0.0"
+      }
+    },
+    "node_modules/levelup/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+    },
+    "node_modules/levelup/node_modules/prr": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
+      "integrity": "sha512-LmUECmrW7RVj6mDWKjTXfKug7TFGdiz9P18HMcO4RHL+RW7MCOGNvpj5j47Rnp6ne6r4fZ2VzyUWEpKbg+tsjQ=="
+    },
+    "node_modules/levelup/node_modules/readable-stream": {
+      "version": "1.0.34",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
+      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/levelup/node_modules/semver": {
+      "version": "2.3.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
+      "integrity": "sha512-abLdIKCosKfpnmhS52NCTjO4RiLspDfsn37prjzGrp9im5DPJOgh82Os92vtwGh6XdQryKI/7SREZnV+aqiXrA==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/levelup/node_modules/xtend": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
+      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
+      "dependencies": {
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/lighthouse-logger": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
+      "integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
+    },
+    "node_modules/lighthouse-logger/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/lighthouse-logger/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/lightningcss": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz",
+      "integrity": "sha512-8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ==",
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      },
+      "optionalDependencies": {
+        "lightningcss-darwin-arm64": "1.27.0",
+        "lightningcss-darwin-x64": "1.27.0",
+        "lightningcss-freebsd-x64": "1.27.0",
+        "lightningcss-linux-arm-gnueabihf": "1.27.0",
+        "lightningcss-linux-arm64-gnu": "1.27.0",
+        "lightningcss-linux-arm64-musl": "1.27.0",
+        "lightningcss-linux-x64-gnu": "1.27.0",
+        "lightningcss-linux-x64-musl": "1.27.0",
+        "lightningcss-win32-arm64-msvc": "1.27.0",
+        "lightningcss-win32-x64-msvc": "1.27.0"
+      }
+    },
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz",
+      "integrity": "sha512-Gl/lqIXY+d+ySmMbgDf0pgaWSqrWYxVHoc88q+Vhf2YNzZ8DwoRzGt5NZDVqqIW5ScpSnmmjcgXP87Dn2ylSSQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz",
+      "integrity": "sha512-0+mZa54IlcNAoQS9E0+niovhyjjQWEMrwW0p2sSdLRhLDc8LMQ/b67z7+B5q4VmjYCMSfnFi3djAAQFIDuj/Tg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz",
+      "integrity": "sha512-n1sEf85fePoU2aDN2PzYjoI8gbBqnmLGEhKq7q0DKLj0UTVmOTwDC7PtLcy/zFxzASTSBlVQYJUhwIStQMIpRA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz",
+      "integrity": "sha512-MUMRmtdRkOkd5z3h986HOuNBD1c2lq2BSQA1Jg88d9I7bmPGx08bwGcnB75dvr17CwxjxD6XPi3Qh8ArmKFqCA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz",
+      "integrity": "sha512-cPsxo1QEWq2sfKkSq2Bq5feQDHdUEwgtA9KaB27J5AX22+l4l0ptgjMZZtYtUnteBofjee+0oW1wQ1guv04a7A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz",
+      "integrity": "sha512-rCGBm2ax7kQ9pBSeITfCW9XSVF69VX+fm5DIpvDZQl4NnQoMQyRwhZQm9pd59m8leZ1IesRqWk2v/DntMo26lg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz",
+      "integrity": "sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz",
+      "integrity": "sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz",
+      "integrity": "sha512-/wXegPS1hnhkeG4OXQKEMQeJd48RDC3qdh+OA8pCuOPCyvnm/yEayrJdJVqzBsqpy1aJklRCVxscpFur80o6iQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz",
+      "integrity": "sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lilconfig": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+      "engines": {
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
+      }
+    },
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
+    },
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "engines": {
+        "node": ">=6.11.5"
+      }
+    },
+    "node_modules/loader-utils": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
+      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+      "dependencies": {
+        "big.js": "^5.2.2",
+        "emojis-list": "^3.0.0",
+        "json5": "^2.1.2"
+      },
+      "engines": {
+        "node": ">=8.9.0"
+      }
+    },
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+      "dependencies": {
+        "p-locate": "^5.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
+    },
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
+    },
+    "node_modules/lodash.memoize": {
+      "version": "4.1.2",
+      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
+      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
+    },
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
+    },
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
+    },
+    "node_modules/lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+    },
+    "node_modules/lodash.uniq": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
+      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+    },
+    "node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+      "dependencies": {
+        "chalk": "^2.0.1"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+      "dependencies": {
+        "color-convert": "^1.9.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/log-symbols/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+      "dependencies": {
+        "js-tokens": "^3.0.0 || ^4.0.0"
+      },
+      "bin": {
+        "loose-envify": "cli.js"
+      }
+    },
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "license": "MIT",
+      "dependencies": {
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+      "dependencies": {
+        "yallist": "^3.0.2"
+      }
+    },
+    "node_modules/ltgt": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
+      "integrity": "sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==",
+      "peer": true
+    },
+    "node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "dependencies": {
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
+      },
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
+      }
+    },
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+      "dependencies": {
+        "tmpl": "1.0.5"
+      }
+    },
+    "node_modules/marky": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+      "dependencies": {
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
+      }
+    },
+    "node_modules/md5-file": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
+      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
+      "dependencies": {
+        "buffer-alloc": "^1.1.0"
+      },
+      "bin": {
+        "md5-file": "cli.js"
+      },
+      "engines": {
+        "node": ">=0.10"
+      }
+    },
+    "node_modules/md5hex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/md5hex/-/md5hex-1.0.0.tgz",
+      "integrity": "sha512-c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ==",
+      "peer": true
+    },
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
+    },
+    "node_modules/media-typer": {
+      "version": "0.3.0",
+      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
+      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/memfs": {
+      "version": "3.5.3",
+      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
+      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+      "dependencies": {
+        "fs-monkey": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
+    },
+    "node_modules/memory-cache": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
+      "integrity": "sha512-OcjA+jzjOYzKmKS6IQVALHLVz+rNTMPoJvCztFaZxwG14wtAW7VRZjwTQu06vKCYOxh4jVnik7ya0SXTB0W+xA==",
+      "peer": true
+    },
+    "node_modules/merge-descriptors": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
+      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    },
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
+      }
+    },
+    "node_modules/methods": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
+      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/metro": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.81.1.tgz",
+      "integrity": "sha512-fqRu4fg8ONW7VfqWFMGgKAcOuMzyoQah2azv9Y3VyFXAmG+AoTU6YIFWqAADESCGVWuWEIvxTJhMf3jxU6jwjA==",
+      "dependencies": {
+        "@babel/code-frame": "^7.24.7",
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "accepts": "^1.3.7",
+        "chalk": "^4.0.0",
+        "ci-info": "^2.0.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "error-stack-parser": "^2.0.6",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "hermes-parser": "0.25.1",
+        "image-size": "^1.0.2",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "jsc-safe-url": "^0.2.2",
+        "lodash.throttle": "^4.1.1",
+        "metro-babel-transformer": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-cache-key": "0.81.1",
+        "metro-config": "0.81.1",
+        "metro-core": "0.81.1",
+        "metro-file-map": "0.81.1",
+        "metro-resolver": "0.81.1",
+        "metro-runtime": "0.81.1",
+        "metro-source-map": "0.81.1",
+        "metro-symbolicate": "0.81.1",
+        "metro-transform-plugins": "0.81.1",
+        "metro-transform-worker": "0.81.1",
+        "mime-types": "^2.1.27",
+        "nullthrows": "^1.1.1",
+        "serialize-error": "^2.1.0",
+        "source-map": "^0.5.6",
+        "throat": "^5.0.0",
+        "ws": "^7.5.10",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "metro": "src/cli.js"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-babel-transformer": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.81.1.tgz",
+      "integrity": "sha512-JECKDrQaUnDmj0x/Q/c8c5YwsatVx38Lu+BfCwX9fR8bWipAzkvJocBpq5rOAJRDXRgDcPv2VO4Q4nFYrpYNQg==",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "hermes-parser": "0.25.1",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
+    },
+    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+      "dependencies": {
+        "hermes-estree": "0.25.1"
+      }
+    },
+    "node_modules/metro-cache": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.81.1.tgz",
+      "integrity": "sha512-Uqcmn6sZ+Y0VJHM88VrG5xCvSeU7RnuvmjPmSOpEcyJJBe02QkfHL05MX2ZyGDTyZdbKCzaX0IijrTe4hN3F0Q==",
+      "dependencies": {
+        "exponential-backoff": "^3.1.1",
+        "flow-enums-runtime": "^0.0.6",
+        "metro-core": "0.81.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-cache-key": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.81.1.tgz",
+      "integrity": "sha512-5fDaHR1yTvpaQuwMAeEoZGsVyvjrkw9IFAS7WixSPvaNY5YfleqoJICPc6hbXFJjvwCCpwmIYFkjqzR/qJ6yqA==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-config": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.81.1.tgz",
+      "integrity": "sha512-VAAJmxsKIZ+Fz5/z1LVgxa32gE6+2TvrDSSx45g85WoX4EtLmdBGP3DSlpQW3DqFUfNHJCGwMLGXpJnxifd08g==",
+      "dependencies": {
+        "connect": "^3.6.5",
+        "cosmiconfig": "^5.0.5",
+        "flow-enums-runtime": "^0.0.6",
+        "jest-validate": "^29.6.3",
+        "metro": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-core": "0.81.1",
+        "metro-runtime": "0.81.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-core": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.81.1.tgz",
+      "integrity": "sha512-4d2/+02IYqOwJs4dmM0dC8hIZqTzgnx2nzN4GTCaXb3Dhtmi/SJ3v6744zZRnithhN4lxf8TTJSHnQV75M7SSA==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6",
+        "lodash.throttle": "^4.1.1",
+        "metro-resolver": "0.81.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-file-map": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.81.1.tgz",
+      "integrity": "sha512-aY72H2ujmRfFxcsbyh83JgqFF+uQ4HFN1VhV2FmcfQG4s1bGKf2Vbkk+vtZ1+EswcBwDZFbkpvAjN49oqwGzAA==",
+      "dependencies": {
+        "debug": "^2.2.0",
+        "fb-watchman": "^2.0.0",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "micromatch": "^4.0.4",
+        "nullthrows": "^1.1.1",
+        "walker": "^1.0.7"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/metro-file-map/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/metro-minify-terser": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.81.1.tgz",
+      "integrity": "sha512-p/Qz3NNh1nebSqMlxlUALAnESo6heQrnvgHtAuxufRPtKvghnVDq9hGGex8H7z7YYLsqe42PWdt4JxTA3mgkvg==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6",
+        "terser": "^5.15.0"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-react-native-babel-preset": {
+      "version": "0.73.9",
+      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.9.tgz",
+      "integrity": "sha512-AoD7v132iYDV4K78yN2OLgTPwtAKn0XlD2pOhzyBxiI8PeXzozhbKyPV7zUOJUPETj+pcEVfuYj5ZN/8+bhbCw==",
+      "peer": true,
+      "dependencies": {
+        "@babel/core": "^7.20.0",
+        "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
+        "@babel/plugin-proposal-class-properties": "^7.0.0",
+        "@babel/plugin-proposal-export-default-from": "^7.0.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
+        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
+        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
+        "@babel/plugin-proposal-optional-chaining": "^7.0.0",
+        "@babel/plugin-syntax-dynamic-import": "^7.0.0",
+        "@babel/plugin-syntax-export-default-from": "^7.0.0",
+        "@babel/plugin-syntax-flow": "^7.18.0",
+        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
+        "@babel/plugin-syntax-optional-chaining": "^7.0.0",
+        "@babel/plugin-transform-arrow-functions": "^7.0.0",
+        "@babel/plugin-transform-async-to-generator": "^7.0.0",
+        "@babel/plugin-transform-block-scoping": "^7.0.0",
+        "@babel/plugin-transform-classes": "^7.0.0",
+        "@babel/plugin-transform-computed-properties": "^7.0.0",
+        "@babel/plugin-transform-destructuring": "^7.0.0",
+        "@babel/plugin-transform-flow-strip-types": "^7.0.0",
+        "@babel/plugin-transform-function-name": "^7.0.0",
+        "@babel/plugin-transform-literals": "^7.0.0",
+        "@babel/plugin-transform-modules-commonjs": "^7.0.0",
+        "@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
+        "@babel/plugin-transform-parameters": "^7.0.0",
+        "@babel/plugin-transform-react-display-name": "^7.0.0",
+        "@babel/plugin-transform-react-jsx": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
+        "@babel/plugin-transform-react-jsx-source": "^7.0.0",
+        "@babel/plugin-transform-runtime": "^7.0.0",
+        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
+        "@babel/plugin-transform-spread": "^7.0.0",
+        "@babel/plugin-transform-sticky-regex": "^7.0.0",
+        "@babel/plugin-transform-template-literals": "^7.0.0",
+        "@babel/plugin-transform-typescript": "^7.5.0",
+        "@babel/plugin-transform-unicode-regex": "^7.0.0",
+        "@babel/template": "^7.0.0",
+        "react-refresh": "^0.4.0"
+      },
+      "peerDependencies": {
+        "@babel/core": "*"
+      }
+    },
+    "node_modules/metro-react-native-babel-preset/node_modules/react-refresh": {
+      "version": "0.4.3",
+      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
+      "integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/metro-resolver": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.81.1.tgz",
+      "integrity": "sha512-E61t6fxRoYRkl6Zo3iUfCKW4DYfum/bLjcejXBMt1y3I7LFkK84TCR/Rs9OAwsMCY/7GOPB4+CREYZOtCC7CNA==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-runtime": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.81.1.tgz",
+      "integrity": "sha512-pqu5j5d01rjF85V/K8SDDJ0NR3dRp6bE3z5bKVVb5O2Rx0nbR9KreUxYALQCRCcQHaYySqCg5fYbGKBHC295YQ==",
+      "dependencies": {
+        "@babel/runtime": "^7.25.0",
+        "flow-enums-runtime": "^0.0.6"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-source-map": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.1.tgz",
+      "integrity": "sha512-1i8ROpNNiga43F0ZixAXoFE/SS3RqcRDCCslpynb+ytym0VI7pkTH1woAN2HI9pczYtPrp3Nq0AjRpsuY35ieA==",
+      "dependencies": {
+        "@babel/traverse": "^7.25.3",
+        "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "0.81.1",
+        "nullthrows": "^1.1.1",
+        "ob1": "0.81.1",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-symbolicate": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.1.tgz",
+      "integrity": "sha512-Lgk0qjEigtFtsM7C0miXITbcV47E1ZYIfB+m/hCraihiwRWkNUQEPCWvqZmwXKSwVE5mXA0EzQtghAvQSjZDxw==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-source-map": "0.81.1",
+        "nullthrows": "^1.1.1",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "bin": {
+        "metro-symbolicate": "src/index.js"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-transform-plugins": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.81.1.tgz",
+      "integrity": "sha512-7L1lI44/CyjIoBaORhY9fVkoNe8hrzgxjSCQ/lQlcfrV31cZb7u0RGOQrKmUX7Bw4FpejrB70ArQ7Mse9mk7+Q==",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "flow-enums-runtime": "^0.0.6",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro-transform-worker": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.81.1.tgz",
+      "integrity": "sha512-M+2hVT3rEy5K7PBmGDgQNq3Zx53TjScOcO/CieyLnCRFtBGWZiSJ2+bLAXXOKyKa/y3bI3i0owxtyxuPGDwbZg==",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "metro": "0.81.1",
+        "metro-babel-transformer": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-cache-key": "0.81.1",
+        "metro-minify-terser": "0.81.1",
+        "metro-source-map": "0.81.1",
+        "metro-transform-plugins": "0.81.1",
+        "nullthrows": "^1.1.1"
+      },
+      "engines": {
+        "node": ">=18.18"
+      }
+    },
+    "node_modules/metro/node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "node_modules/metro/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/metro/node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
+    },
+    "node_modules/metro/node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+      "dependencies": {
+        "hermes-estree": "0.25.1"
+      }
+    },
+    "node_modules/metro/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
-      "peer": true,
+    "node_modules/metro/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "engines": {
-        "node": ">=6.11.5"
+        "node": ">=8.3.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=8.6"
+      }
+    },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+      "engines": {
+        "node": ">=8.6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.mergewith": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
-    },
-    "node_modules/lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
-    },
-    "node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
-      "dependencies": {
-        "chalk": "^2.0.1"
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
-      "dependencies": {
-        "color-convert": "^1.9.0"
-      },
+    "node_modules/mime-db": {
+      "version": "1.53.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
-      "dependencies": {
-        "color-name": "1.1.3"
+    "node_modules/mime-types/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/log-symbols/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+    "node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=4"
       }
     },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/mini-css-extract-plugin": {
+      "version": "2.9.2",
+      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
+      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "schema-utils": "^4.0.0",
+        "tapable": "^2.2.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
+    "node_modules/minimalistic-assert": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
+      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    },
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+        "brace-expansion": "^1.1.7"
       },
-      "bin": {
-        "loose-envify": "cli.js"
+      "engines": {
+        "node": "*"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "tslib": "^2.0.3"
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
-      "dependencies": {
-        "yallist": "^3.0.2"
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+      "engines": {
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+    "node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
+      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
       "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
       "dependencies": {
-        "tmpl": "1.0.5"
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/marky": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="
-    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+    "node_modules/minipass-flush/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
       }
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+    "node_modules/minipass-flush/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
       "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
+        "minipass": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/md5-file": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
-      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
+    "node_modules/minipass-pipeline/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dependencies": {
-        "buffer-alloc": "^1.1.0"
-      },
-      "bin": {
-        "md5-file": "cli.js"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=8"
       }
     },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    "node_modules/minipass-pipeline/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+      "dependencies": {
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
+      },
       "engines": {
         "node": ">= 8"
       }
     },
-    "node_modules/metro": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro/-/metro-0.81.1.tgz",
-      "integrity": "sha512-fqRu4fg8ONW7VfqWFMGgKAcOuMzyoQah2azv9Y3VyFXAmG+AoTU6YIFWqAADESCGVWuWEIvxTJhMf3jxU6jwjA==",
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/parser": "^7.25.3",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.3",
-        "@babel/types": "^7.25.2",
-        "accepts": "^1.3.7",
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "connect": "^3.6.5",
-        "debug": "^2.2.0",
-        "error-stack-parser": "^2.0.6",
-        "flow-enums-runtime": "^0.0.6",
-        "graceful-fs": "^4.2.4",
-        "hermes-parser": "0.25.1",
-        "image-size": "^1.0.2",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "jsc-safe-url": "^0.2.2",
-        "lodash.throttle": "^4.1.1",
-        "metro-babel-transformer": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-cache-key": "0.81.1",
-        "metro-config": "0.81.1",
-        "metro-core": "0.81.1",
-        "metro-file-map": "0.81.1",
-        "metro-resolver": "0.81.1",
-        "metro-runtime": "0.81.1",
-        "metro-source-map": "0.81.1",
-        "metro-symbolicate": "0.81.1",
-        "metro-transform-plugins": "0.81.1",
-        "metro-transform-worker": "0.81.1",
-        "mime-types": "^2.1.27",
-        "nullthrows": "^1.1.1",
-        "serialize-error": "^2.1.0",
-        "source-map": "^0.5.6",
-        "throat": "^5.0.0",
-        "ws": "^7.5.10",
-        "yargs": "^17.6.2"
-      },
-      "bin": {
-        "metro": "src/cli.js"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=8"
       }
     },
-    "node_modules/metro-babel-transformer": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.81.1.tgz",
-      "integrity": "sha512-JECKDrQaUnDmj0x/Q/c8c5YwsatVx38Lu+BfCwX9fR8bWipAzkvJocBpq5rOAJRDXRgDcPv2VO4Q4nFYrpYNQg==",
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "hermes-parser": "0.25.1",
-        "nullthrows": "^1.1.1"
+        "minimist": "^1.2.6"
       },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
+      }
+    },
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=18.18"
+        "node": "*"
       }
     },
-    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
-      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
     },
-    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
-      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
+    "node_modules/multicast-dns": {
+      "version": "7.2.5",
+      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
+      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dependencies": {
-        "hermes-estree": "0.25.1"
+        "dns-packet": "^5.2.2",
+        "thunky": "^1.0.2"
+      },
+      "bin": {
+        "multicast-dns": "cli.js"
       }
     },
-    "node_modules/metro-cache": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.81.1.tgz",
-      "integrity": "sha512-Uqcmn6sZ+Y0VJHM88VrG5xCvSeU7RnuvmjPmSOpEcyJJBe02QkfHL05MX2ZyGDTyZdbKCzaX0IijrTe4hN3F0Q==",
+    "node_modules/mv": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
+      "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "exponential-backoff": "^3.1.1",
-        "flow-enums-runtime": "^0.0.6",
-        "metro-core": "0.81.1"
+        "mkdirp": "~0.5.1",
+        "ncp": "~2.0.0",
+        "rimraf": "~2.4.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/metro-cache-key": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.81.1.tgz",
-      "integrity": "sha512-5fDaHR1yTvpaQuwMAeEoZGsVyvjrkw9IFAS7WixSPvaNY5YfleqoJICPc6hbXFJjvwCCpwmIYFkjqzR/qJ6yqA==",
+    "node_modules/mv/node_modules/glob": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
+      "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "2 || 3",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": "*"
       }
     },
-    "node_modules/metro-config": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.81.1.tgz",
-      "integrity": "sha512-VAAJmxsKIZ+Fz5/z1LVgxa32gE6+2TvrDSSx45g85WoX4EtLmdBGP3DSlpQW3DqFUfNHJCGwMLGXpJnxifd08g==",
+    "node_modules/mv/node_modules/rimraf": {
+      "version": "2.4.5",
+      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
+      "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
+      "deprecated": "Rimraf versions prior to v4 are no longer supported",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "connect": "^3.6.5",
-        "cosmiconfig": "^5.0.5",
-        "flow-enums-runtime": "^0.0.6",
-        "jest-validate": "^29.6.3",
-        "metro": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-core": "0.81.1",
-        "metro-runtime": "0.81.1"
+        "glob": "^6.0.1"
+      },
+      "bin": {
+        "rimraf": "bin.js"
+      }
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+      "dependencies": {
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
+      }
+    },
+    "node_modules/nanoid": {
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
       }
     },
-    "node_modules/metro-core": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.81.1.tgz",
-      "integrity": "sha512-4d2/+02IYqOwJs4dmM0dC8hIZqTzgnx2nzN4GTCaXb3Dhtmi/SJ3v6744zZRnithhN4lxf8TTJSHnQV75M7SSA==",
+    "node_modules/nativewind": {
+      "version": "4.0.36",
+      "resolved": "https://registry.npmjs.org/nativewind/-/nativewind-4.0.36.tgz",
+      "integrity": "sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==",
+      "license": "MIT",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.81.1"
+        "react-native-css-interop": "0.0.36"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=16"
+      },
+      "peerDependencies": {
+        "tailwindcss": ">3.3.0"
+      }
+    },
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/ncp": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
+      "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
+      "optional": true,
+      "peer": true,
+      "bin": {
+        "ncp": "bin/ncp"
       }
     },
-    "node_modules/metro-file-map": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.81.1.tgz",
-      "integrity": "sha512-aY72H2ujmRfFxcsbyh83JgqFF+uQ4HFN1VhV2FmcfQG4s1bGKf2Vbkk+vtZ1+EswcBwDZFbkpvAjN49oqwGzAA==",
-      "dependencies": {
-        "debug": "^2.2.0",
-        "fb-watchman": "^2.0.0",
-        "flow-enums-runtime": "^0.0.6",
-        "graceful-fs": "^4.2.4",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "micromatch": "^4.0.4",
-        "nullthrows": "^1.1.1",
-        "walker": "^1.0.7"
-      },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/metro-file-map/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/nested-error-stacks": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz",
+      "integrity": "sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "2.0.0"
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/metro-file-map/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/metro-minify-terser": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.81.1.tgz",
-      "integrity": "sha512-p/Qz3NNh1nebSqMlxlUALAnESo6heQrnvgHtAuxufRPtKvghnVDq9hGGex8H7z7YYLsqe42PWdt4JxTA3mgkvg==",
+    "node_modules/node-dir": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+      "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "terser": "^5.15.0"
+        "minimatch": "^3.0.2"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 0.10.5"
       }
     },
-    "node_modules/metro-resolver": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.81.1.tgz",
-      "integrity": "sha512-E61t6fxRoYRkl6Zo3iUfCKW4DYfum/bLjcejXBMt1y3I7LFkK84TCR/Rs9OAwsMCY/7GOPB4+CREYZOtCC7CNA==",
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": "4.x || >=6.0.0"
+      },
+      "peerDependencies": {
+        "encoding": "^0.1.0"
+      },
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/metro-runtime": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.81.1.tgz",
-      "integrity": "sha512-pqu5j5d01rjF85V/K8SDDJ0NR3dRp6bE3z5bKVVb5O2Rx0nbR9KreUxYALQCRCcQHaYySqCg5fYbGKBHC295YQ==",
-      "dependencies": {
-        "@babel/runtime": "^7.25.0",
-        "flow-enums-runtime": "^0.0.6"
-      },
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 6.13.0"
       }
     },
-    "node_modules/metro-source-map": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.1.tgz",
-      "integrity": "sha512-1i8ROpNNiga43F0ZixAXoFE/SS3RqcRDCCslpynb+ytym0VI7pkTH1woAN2HI9pczYtPrp3Nq0AjRpsuY35ieA==",
+    "node_modules/node-html-parser": {
+      "version": "5.4.2",
+      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
+      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
       "dependencies": {
-        "@babel/traverse": "^7.25.3",
-        "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
-        "@babel/types": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "invariant": "^2.2.4",
-        "metro-symbolicate": "0.81.1",
-        "nullthrows": "^1.1.1",
-        "ob1": "0.81.1",
-        "source-map": "^0.5.6",
-        "vlq": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=18.18"
+        "css-select": "^4.2.1",
+        "he": "1.2.0"
       }
     },
-    "node_modules/metro-symbolicate": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.1.tgz",
-      "integrity": "sha512-Lgk0qjEigtFtsM7C0miXITbcV47E1ZYIfB+m/hCraihiwRWkNUQEPCWvqZmwXKSwVE5mXA0EzQtghAvQSjZDxw==",
+    "node_modules/node-html-parser/node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "invariant": "^2.2.4",
-        "metro-source-map": "0.81.1",
-        "nullthrows": "^1.1.1",
-        "source-map": "^0.5.6",
-        "vlq": "^1.0.0"
-      },
-      "bin": {
-        "metro-symbolicate": "src/index.js"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
       },
-      "engines": {
-        "node": ">=18.18"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/metro-transform-plugins": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.81.1.tgz",
-      "integrity": "sha512-7L1lI44/CyjIoBaORhY9fVkoNe8hrzgxjSCQ/lQlcfrV31cZb7u0RGOQrKmUX7Bw4FpejrB70ArQ7Mse9mk7+Q==",
+    "node_modules/node-html-parser/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.3",
-        "flow-enums-runtime": "^0.0.6",
-        "nullthrows": "^1.1.1"
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
       },
-      "engines": {
-        "node": ">=18.18"
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/metro-transform-worker": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.81.1.tgz",
-      "integrity": "sha512-M+2hVT3rEy5K7PBmGDgQNq3Zx53TjScOcO/CieyLnCRFtBGWZiSJ2+bLAXXOKyKa/y3bI3i0owxtyxuPGDwbZg==",
+    "node_modules/node-html-parser/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/parser": "^7.25.3",
-        "@babel/types": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "metro": "0.81.1",
-        "metro-babel-transformer": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-cache-key": "0.81.1",
-        "metro-minify-terser": "0.81.1",
-        "metro-source-map": "0.81.1",
-        "metro-transform-plugins": "0.81.1",
-        "nullthrows": "^1.1.1"
+        "domelementtype": "^2.2.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/metro/node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
-    },
-    "node_modules/metro/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/node-html-parser/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
       "dependencies": {
-        "ms": "2.0.0"
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/metro/node_modules/hermes-estree": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
-      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
-    },
-    "node_modules/metro/node_modules/hermes-parser": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
-      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
-      "dependencies": {
-        "hermes-estree": "0.25.1"
+    "node_modules/node-html-parser/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/metro/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
-    "node_modules/metro/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
+    },
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "engines": {
-        "node": ">=8.3.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/normalize-url": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
+      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
+      "engines": {
+        "node": ">=10"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
+    "node_modules/npm-package-arg": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
+      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
       "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+        "hosted-git-info": "^7.0.0",
+        "proc-log": "^4.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
       },
       "engines": {
-        "node": ">=8.6"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
+    "node_modules/npm-package-arg/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+      "dependencies": {
+        "path-key": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
-      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dependencies": {
-        "mime-db": "1.52.0"
+        "boolbase": "^1.0.0"
       },
-      "engines": {
-        "node": ">= 0.6"
+      "funding": {
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/mime-types/node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
-      "engines": {
-        "node": ">= 0.6"
-      }
+    "node_modules/nullthrows": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
+      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
     },
-    "node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
+    "node_modules/nwsapi": {
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ=="
+    },
+    "node_modules/ob1": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.81.1.tgz",
+      "integrity": "sha512-1PEbvI+AFvOcgdNcO79FtDI1TUO8S3lhiKOyAiyWQF3sFDDKS+aw2/BZvGlArFnSmqckwOOB9chQuIX0/OahoQ==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=18.18"
       }
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
       "engines": {
-        "node": "*"
+        "node": ">= 6"
       }
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "engines": {
+        "node": ">= 0.4"
+      },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
+    "node_modules/object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
       "dependencies": {
-        "minipass": "^7.0.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
       "dependencies": {
-        "yallist": "^4.0.0"
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+    "node_modules/object.values": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
+      "dev": true,
       "dependencies": {
-        "minipass": "^3.0.0"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/obuf": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
+      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
+    },
+    "node_modules/octal": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz",
+      "integrity": "sha512-nnda7W8d+A3vEIY+UrDQzzboPf1vhs4JYVhff5CDkq9QNoZY7Xrxeo/htox37j9dZf7yNHevZzqtejWgy1vCqQ=="
+    },
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "ee-first": "1.1.1"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/minipass-pipeline/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
       "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
+        "wrappy": "1"
+      }
+    },
+    "node_modules/onetime": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
+      "dependencies": {
+        "mimic-fn": "^1.0.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
       },
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
       "dependencies": {
-        "minimist": "^1.2.6"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      }
-    },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
-      "license": "MIT",
-      "optional": true,
       "engines": {
-        "node": "*"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+    "node_modules/ora": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">=6"
       }
     },
-    "node_modules/nativewind": {
-      "version": "4.0.36",
-      "resolved": "https://registry.npmjs.org/nativewind/-/nativewind-4.0.36.tgz",
-      "integrity": "sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==",
-      "license": "MIT",
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "react-native-css-interop": "0.0.36"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=16"
-      },
-      "peerDependencies": {
-        "tailwindcss": ">3.3.0"
+        "node": ">=4"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+    "node_modules/ora/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+      "dependencies": {
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
     },
-    "node_modules/nested-error-stacks": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz",
-      "integrity": "sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
     },
-    "node_modules/nice-try": {
+    "node_modules/ora/node_modules/escape-string-regexp": {
       "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
-    },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/node-dir": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
-      "dependencies": {
-        "minimatch": "^3.0.2"
-      },
+    "node_modules/ora/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
-        "node": ">= 0.10.5"
+        "node": ">=4"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
-      },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
+        "node": ">=6"
       }
     },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+      "dependencies": {
+        "has-flag": "^3.0.0"
+      },
       "engines": {
-        "node": ">= 6.13.0"
+        "node": ">=4"
       }
     },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+    "node_modules/os-homedir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
+      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
+      "peer": true,
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-package-arg": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
-      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
-      "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
-      },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/npm-package-arg/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+    "node_modules/osenv": {
+      "version": "0.1.5",
+      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
+      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
+      "deprecated": "This package is no longer supported.",
+      "peer": true,
+      "dependencies": {
+        "os-homedir": "^1.0.0",
+        "os-tmpdir": "^1.0.0"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
       "dependencies": {
-        "path-key": "^2.0.0"
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dependencies": {
-        "boolbase": "^1.0.0"
+        "yocto-queue": "^0.1.0"
+      },
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/nullthrows": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
-      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
-      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ=="
-    },
-    "node_modules/ob1": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.81.1.tgz",
-      "integrity": "sha512-1PEbvI+AFvOcgdNcO79FtDI1TUO8S3lhiKOyAiyWQF3sFDDKS+aw2/BZvGlArFnSmqckwOOB9chQuIX0/OahoQ==",
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "p-limit": "^3.0.2"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+      "dependencies": {
+        "aggregate-error": "^3.0.0"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+    "node_modules/p-retry": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
+      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
+      "dependencies": {
+        "@types/retry": "0.12.0",
+        "retry": "^0.13.1"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
-      "dev": true,
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "dev": true,
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+    },
+    "node_modules/pako": {
+      "version": "0.2.9",
+      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
+      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
+    },
+    "node_modules/param-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
+      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
+      "dependencies": {
+        "dot-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
       "dev": true,
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "object-keys": "^1.1.1"
+        "callsites": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=6"
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+    "node_modules/parent-module/node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
       "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
-      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
-      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
-      "dev": true,
+    "node_modules/parse-png": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-png/-/parse-png-2.1.0.tgz",
+      "integrity": "sha512-Nt/a5SfCLiTnQAjx3fHlqp8hRgTL3z7kTQZzvIMS9uCAepnCyjpdEc6M/sz69WqMBdaDBw9sF1F1UaHROYzGkQ==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "pngjs": "^3.3.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=10"
       }
     },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+    "node_modules/parse5": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "dependencies": {
-        "ee-first": "1.1.1"
+        "entities": "^4.5.0"
       },
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      }
+    },
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "engines": {
         "node": ">= 0.8"
       }
     },
-    "node_modules/on-headers": {
+    "node_modules/pascal-case": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
+      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
+      "dependencies": {
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
+      }
+    },
+    "node_modules/password-prompt": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz",
+      "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==",
+      "dependencies": {
+        "ansi-escapes": "^4.3.2",
+        "cross-spawn": "^7.0.3"
+      }
+    },
+    "node_modules/path-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
+      "integrity": "sha512-WA3pxi1olUQcsl82W576vkqhUSGp0uBtr/381pxx5WXLp3NC+AB99hUG3aGW7H0Kg9PFr1D8wv1iJeICe+9Mhw=="
+    },
+    "node_modules/path-dirname": {
       "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
+    "node_modules/path-is-inside": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
+      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
+    },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
-      "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
-      },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/path-to-regexp": {
+      "version": "0.1.12",
+      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
+      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/ora": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^2.0.0",
-        "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.2.0",
-        "wcwidth": "^1.0.1"
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    },
+    "node_modules/picomatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+      "engines": {
+        "node": ">=10"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
+      }
+    },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+    "node_modules/pinkie": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
+      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/pinkie-promise": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
+      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "pinkie": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
-      },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "engines": {
-        "node": ">=4"
+        "node": ">= 6"
       }
     },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "find-up": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/ora/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/has-flag": {
+    "node_modules/pkg-dir/node_modules/locate-path": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dependencies": {
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "p-try": "^2.0.0"
       },
       "engines": {
         "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
-      "dev": true,
+    "node_modules/pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.6",
-        "object-keys": "^1.1.1",
-        "safe-push-apply": "^1.0.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=8"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+    "node_modules/pkg-up/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "license": "MIT",
+      "dependencies": {
+        "locate-path": "^3.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/pkg-up/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "license": "MIT",
       "dependencies": {
-        "p-limit": "^3.0.2"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/pkg-up/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "license": "MIT",
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=6"
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/pkg-up/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
-    },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
+    "node_modules/plist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
       "dependencies": {
-        "callsites": "^3.0.0"
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10.4.0"
       }
     },
-    "node_modules/parent-module/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
+    "node_modules/plist/node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
-      "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
-      },
+    "node_modules/plist/node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8.0"
       }
     },
-    "node_modules/parse-png": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-png/-/parse-png-2.1.0.tgz",
-      "integrity": "sha512-Nt/a5SfCLiTnQAjx3fHlqp8hRgTL3z7kTQZzvIMS9uCAepnCyjpdEc6M/sz69WqMBdaDBw9sF1F1UaHROYzGkQ==",
+    "node_modules/pngjs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+      "engines": {
+        "node": ">=4.0.0"
+      }
+    },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "pngjs": "^3.3.0"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/parse5": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
-      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+    "node_modules/postcss-calc": {
+      "version": "8.2.4",
+      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
+      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
       "dependencies": {
-        "entities": "^4.5.0"
+        "postcss-selector-parser": "^6.0.9",
+        "postcss-value-parser": "^4.2.0"
       },
-      "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
+      "peerDependencies": {
+        "postcss": "^8.2.2"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
+    "node_modules/postcss-colormin": {
+      "version": "5.3.1",
+      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
+      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0",
+        "colord": "^2.9.1",
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/password-prompt": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz",
-      "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==",
+    "node_modules/postcss-convert-values": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
+      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
       "dependencies": {
-        "ansi-escapes": "^4.3.2",
-        "cross-spawn": "^7.0.3"
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+    "node_modules/postcss-discard-comments": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
+      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
       "engines": {
-        "node": ">=8"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+    "node_modules/postcss-discard-duplicates": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
+      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+    "node_modules/postcss-discard-empty": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
+      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
       "engines": {
-        "node": ">=8"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    "node_modules/postcss-discard-overridden": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
+      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
     },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": ">=14.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "peerDependencies": {
+        "postcss": "^8.0.0"
       }
     },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+      "dependencies": {
+        "camelcase-css": "^2.0.1"
+      },
       "engines": {
-        "node": ">=8"
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
+      },
+      "peerDependencies": {
+        "postcss": "^8.4.21"
       }
     },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
-    },
-    "node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+    "node_modules/postcss-load-config": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "dependencies": {
+        "lilconfig": "^3.0.0",
+        "yaml": "^2.3.4"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+      "peerDependencies": {
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+    "node_modules/postcss-merge-longhand": {
+      "version": "5.1.7",
+      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
+      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "stylehacks": "^5.1.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+    "node_modules/postcss-merge-rules": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
+      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0",
+        "cssnano-utils": "^3.1.0",
+        "postcss-selector-parser": "^6.0.5"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+    "node_modules/postcss-minify-font-values": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
+      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+    "node_modules/postcss-minify-gradients": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
+      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "colord": "^2.9.1",
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+    "node_modules/postcss-minify-params": {
+      "version": "5.1.4",
+      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
+      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "browserslist": "^4.21.4",
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/postcss-minify-selectors": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
+      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "postcss-selector-parser": "^6.0.5"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >=14.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dependencies": {
-        "p-limit": "^2.0.0"
-      },
+    "node_modules/postcss-modules-extract-imports": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
+      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/pkg-dir/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+    "node_modules/postcss-modules-local-by-default": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
+      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+      "dependencies": {
+        "icss-utils": "^5.0.0",
+        "postcss-selector-parser": "^7.0.0",
+        "postcss-value-parser": "^4.1.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-modules-scope": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
+      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "postcss-selector-parser": "^7.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >= 14"
+      },
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
+      "version": "7.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
+      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
       "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
+        "cssesc": "^3.0.0",
+        "util-deprecate": "^1.0.2"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-modules-values": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
+      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "icss-utils": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^10 || ^12 || >= 14"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "peerDependencies": {
+        "postcss": "^8.1.0"
       }
     },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-nested": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "postcss-selector-parser": "^6.1.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=12.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.14"
       }
     },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "dev": true,
-      "license": "MIT",
+    "node_modules/postcss-normalize-charset": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
+      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
       "engines": {
-        "node": ">=4"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/plist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
-      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+    "node_modules/postcss-normalize-display-values": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
+      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
       "dependencies": {
-        "@xmldom/xmldom": "^0.8.8",
-        "base64-js": "^1.5.1",
-        "xmlbuilder": "^15.1.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=10.4.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/plist/node_modules/@xmldom/xmldom": {
-      "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+    "node_modules/postcss-normalize-positions": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
+      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">=10.0.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/plist/node_modules/xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
+    "node_modules/postcss-normalize-repeat-style": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
+      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">=8.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/pngjs": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
-      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+    "node_modules/postcss-normalize-string": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
+      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
-      "dev": true,
+    "node_modules/postcss-normalize-timing-functions": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
+      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+    "node_modules/postcss-normalize-unicode": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
+      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-import": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
+    "node_modules/postcss-normalize-url": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
+      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
       "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
+        "normalize-url": "^6.0.1",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=14.0.0"
+        "node": "^10 || ^12 || >=14.0"
       },
       "peerDependencies": {
-        "postcss": "^8.0.0"
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-js": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+    "node_modules/postcss-normalize-whitespace": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
+      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
       "dependencies": {
-        "camelcase-css": "^2.0.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": "^12 || ^14 || >= 16"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
+        "node": "^10 || ^12 || >=14.0"
       },
       "peerDependencies": {
-        "postcss": "^8.4.21"
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-load-config": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "node_modules/postcss-ordered-values": {
+      "version": "5.1.3",
+      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
+      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
       "dependencies": {
-        "lilconfig": "^3.0.0",
-        "yaml": "^2.3.4"
+        "cssnano-utils": "^3.1.0",
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">= 14"
+        "node": "^10 || ^12 || >=14.0"
       },
       "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-reduce-initial": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
+      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "caniuse-api": "^3.0.0"
       },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
       }
     },
-    "node_modules/postcss-nested": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "node_modules/postcss-reduce-transforms": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
+      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
       "dependencies": {
-        "postcss-selector-parser": "^6.1.1"
+        "postcss-value-parser": "^4.2.0"
       },
       "engines": {
-        "node": ">=12.0"
+        "node": "^10 || ^12 || >=14.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.14"
+        "postcss": "^8.2.15"
       }
     },
     "node_modules/postcss-selector-parser": {
@@ -13547,6 +18405,129 @@
         "node": ">=4"
       }
     },
+    "node_modules/postcss-svgo": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
+      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
+      "dependencies": {
+        "postcss-value-parser": "^4.2.0",
+        "svgo": "^2.7.0"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/csso": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
+      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
+      "dependencies": {
+        "css-tree": "^1.1.2"
+      },
+      "engines": {
+        "node": ">=8.0.0"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/postcss-svgo/node_modules/svgo": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
+      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
+      "dependencies": {
+        "@trysound/sax": "0.2.0",
+        "commander": "^7.2.0",
+        "css-select": "^4.1.3",
+        "css-tree": "^1.1.3",
+        "csso": "^4.2.0",
+        "picocolors": "^1.0.0",
+        "stable": "^0.1.8"
+      },
+      "bin": {
+        "svgo": "bin/svgo"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
+    "node_modules/postcss-unique-selectors": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
+      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
+      "dependencies": {
+        "postcss-selector-parser": "^6.0.5"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
@@ -13587,6 +18568,15 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/pretty-error": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
+      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
+      "dependencies": {
+        "lodash": "^4.17.20",
+        "renderkid": "^3.0.0"
+      }
+    },
     "node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -13619,6 +18609,19 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/process": {
+      "version": "0.11.10",
+      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
+      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
+      "engines": {
+        "node": ">= 0.6.0"
+      }
+    },
+    "node_modules/process-nextick-args": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
+    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -13635,6 +18638,12 @@
         "asap": "~2.0.3"
       }
     },
+    "node_modules/promise-inflight": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
+      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
+      "peer": true
+    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -13662,12 +18671,29 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
+    "node_modules/proxy-addr": {
+      "version": "2.0.7",
+      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
+      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
+      "dependencies": {
+        "forwarded": "0.2.0",
+        "ipaddr.js": "1.9.1"
+      },
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
       "license": "MIT"
     },
+    "node_modules/prr": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
+      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
+    },
     "node_modules/psl": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
@@ -13719,6 +18745,20 @@
         "qrcode-terminal": "bin/qrcode-terminal.js"
       }
     },
+    "node_modules/qs": {
+      "version": "6.13.0",
+      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
+      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
+      "dependencies": {
+        "side-channel": "^1.0.6"
+      },
+      "engines": {
+        "node": ">=0.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/query-string": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
@@ -13737,6 +18777,23 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/querystring": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
+      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
+      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/querystring-es3": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
+      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -13773,7 +18830,6 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
-      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -13786,6 +18842,31 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/raw-body": {
+      "version": "2.5.2",
+      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
+      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "http-errors": "2.0.0",
+        "iconv-lite": "0.4.24",
+        "unpipe": "1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/raw-body/node_modules/iconv-lite": {
+      "version": "0.4.24",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
+      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -14270,6 +19351,18 @@
         "react-native": ">=0.73.0"
       }
     },
+    "node_modules/react-native-level-fs": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/react-native-level-fs/-/react-native-level-fs-3.0.1.tgz",
+      "integrity": "sha512-ffihv0Obh2zGFcpHHDlq7bQHfGPwgtmZ4No1tx9jAJF69vkQS6TI93AE2FK2qP7tsDg0DNSnn+KuJoriYilJNA==",
+      "dependencies": {
+        "level-filesystem": "^1.0.1",
+        "levelup": "^0.18.2"
+      },
+      "peerDependencies": {
+        "asyncstorage-down": ">=3.0.0 <5.0.0"
+      }
+    },
     "node_modules/react-native-maps": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.18.0.tgz",
@@ -14292,6 +19385,11 @@
         }
       }
     },
+    "node_modules/react-native-os": {
+      "version": "1.2.6",
+      "resolved": "https://registry.npmjs.org/react-native-os/-/react-native-os-1.2.6.tgz",
+      "integrity": "sha512-OlT+xQAcvkcnf7imgXiu+myMkqDt4xw2bP5SlVo19hEn5XHBkPMLX7dk3sSGxxncH/ToMDsf1KLyrPabNVtadA=="
+    },
     "node_modules/react-native-pager-view": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.7.0.tgz",
@@ -14376,15 +19474,131 @@
         "path-dirname": "^1.0.2"
       },
       "peerDependencies": {
-        "react-native": ">=0.59.0",
-        "react-native-svg": ">=12.0.0"
+        "react-native": ">=0.59.0",
+        "react-native-svg": ">=12.0.0"
+      }
+    },
+    "node_modules/react-native-swipe-gestures": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
+      "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw==",
+      "license": "MIT"
+    },
+    "node_modules/react-native-tcp": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/react-native-tcp/-/react-native-tcp-3.3.2.tgz",
+      "integrity": "sha512-zjFmjAvYOsBkR1MF7htuPlk+uOzTykKaeu/eN+I7fkZ7UqBCW+9u/gJgWCv6Tjfn2tGgku6hsEWril4Oy3zJhg==",
+      "dependencies": {
+        "base64-js": "0.0.8",
+        "buffer": "^5.0.0",
+        "events": "^1.0.2",
+        "ip-regex": "^1.0.3",
+        "process": "^0.11.9",
+        "util": "^0.10.3"
+      },
+      "peerDependencies": {
+        "react-native": ">=0.40.0"
+      }
+    },
+    "node_modules/react-native-tcp/node_modules/base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/react-native-tcp/node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/react-native-tcp/node_modules/ip-regex": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
+      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-native-udp": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/react-native-udp/-/react-native-udp-2.7.0.tgz",
+      "integrity": "sha512-tT+Wn0yLbdaTohXkGGor0HYgScGaASWCaCLSO1kCIUdNke7AtcOX5a5nfNLYrEjdUn7/2HRofuplyky7iJHSQA==",
+      "dependencies": {
+        "base64-js": "0.0.8",
+        "events": "^1.0.2",
+        "inherits": "^2.0.1",
+        "ip-regex": "^1.0.3",
+        "util": "^0.10.3"
+      }
+    },
+    "node_modules/react-native-udp/node_modules/base64-js": {
+      "version": "0.0.8",
+      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
+      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
+      "engines": {
+        "node": ">= 0.4"
+      }
+    },
+    "node_modules/react-native-udp/node_modules/events": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
+      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
+      "engines": {
+        "node": ">=0.4.x"
+      }
+    },
+    "node_modules/react-native-udp/node_modules/ip-regex": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
+      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/react-native-url-polyfill": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz",
+      "integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==",
+      "dependencies": {
+        "whatwg-url-without-unicode": "8.0.0-3"
+      },
+      "peerDependencies": {
+        "react-native": "*"
       }
     },
-    "node_modules/react-native-swipe-gestures": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
-      "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw==",
-      "license": "MIT"
+    "node_modules/react-native-web": {
+      "version": "0.19.13",
+      "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.19.13.tgz",
+      "integrity": "sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A==",
+      "dependencies": {
+        "@babel/runtime": "^7.18.6",
+        "@react-native/normalize-colors": "^0.74.1",
+        "fbjs": "^3.0.4",
+        "inline-style-prefixer": "^6.0.1",
+        "memoize-one": "^6.0.0",
+        "nullthrows": "^1.1.1",
+        "postcss-value-parser": "^4.2.0",
+        "styleq": "^0.1.3"
+      },
+      "peerDependencies": {
+        "react": "^18.0.0",
+        "react-dom": "^18.0.0"
+      }
+    },
+    "node_modules/react-native-web/node_modules/@react-native/normalize-colors": {
+      "version": "0.74.89",
+      "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.74.89.tgz",
+      "integrity": "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="
+    },
+    "node_modules/react-native-web/node_modules/memoize-one": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
     },
     "node_modules/react-native/node_modules/babel-plugin-syntax-hermes-parser": {
       "version": "0.23.1",
@@ -14534,6 +19748,22 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/readable-stream": {
+      "version": "1.1.14",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
+      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
+      "dependencies": {
+        "core-util-is": "~1.0.0",
+        "inherits": "~2.0.1",
+        "isarray": "0.0.1",
+        "string_decoder": "~0.10.x"
+      }
+    },
+    "node_modules/readable-stream/node_modules/isarray": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
+      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
+    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -14630,7 +19860,6 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
       "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -14681,7 +19910,6 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
       "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -14713,6 +19941,26 @@
         "node": ">=4"
       }
     },
+    "node_modules/registry-auth-token": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
+      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
+      "dependencies": {
+        "rc": "^1.1.6",
+        "safe-buffer": "^5.0.1"
+      }
+    },
+    "node_modules/registry-url": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
+      "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==",
+      "dependencies": {
+        "rc": "^1.0.1"
+      },
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
     "node_modules/regjsgen": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
@@ -14740,11 +19988,105 @@
         "node": ">=6"
       }
     },
+    "node_modules/relateurl": {
+      "version": "0.2.7",
+      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
+      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
     "node_modules/remove-trailing-slash": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz",
       "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="
     },
+    "node_modules/renderkid": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
+      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
+      "dependencies": {
+        "css-select": "^4.1.3",
+        "dom-converter": "^0.2.0",
+        "htmlparser2": "^6.1.0",
+        "lodash": "^4.17.21",
+        "strip-ansi": "^6.0.1"
+      }
+    },
+    "node_modules/renderkid/node_modules/css-select": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
+      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+      "dependencies": {
+        "boolbase": "^1.0.0",
+        "css-what": "^6.0.1",
+        "domhandler": "^4.3.1",
+        "domutils": "^2.8.0",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
+      }
+    },
+    "node_modules/renderkid/node_modules/dom-serializer": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
+      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+      "dependencies": {
+        "domelementtype": "^2.0.1",
+        "domhandler": "^4.2.0",
+        "entities": "^2.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/domhandler": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
+      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+      "dependencies": {
+        "domelementtype": "^2.2.0"
+      },
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/domutils": {
+      "version": "2.8.0",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
+      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+      "dependencies": {
+        "dom-serializer": "^1.0.1",
+        "domelementtype": "^2.2.0",
+        "domhandler": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/entities": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
+      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
+      }
+    },
+    "node_modules/renderkid/node_modules/strip-ansi": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
+      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
+      "dependencies": {
+        "ansi-regex": "^5.0.1"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -14791,7 +20133,6 @@
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
       "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
-      "dev": true,
       "license": "MIT"
     },
     "node_modules/resolve": {
@@ -14871,6 +20212,14 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
+    "node_modules/retry": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
+      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
+      "engines": {
+        "node": ">= 4"
+      }
+    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -14941,7 +20290,6 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
       "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -14975,11 +20323,17 @@
         }
       ]
     },
+    "node_modules/safe-json-stringify": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
+      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
+      "optional": true,
+      "peer": true
+    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
       "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
-      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "isarray": "^2.0.5"
@@ -14995,7 +20349,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -15086,6 +20439,11 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
+    "node_modules/select-hose": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
+      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
+    },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
@@ -15181,11 +20539,72 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
-      "peer": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
+    "node_modules/serve-index": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
+      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
+      "dependencies": {
+        "accepts": "~1.3.4",
+        "batch": "0.6.1",
+        "debug": "2.6.9",
+        "escape-html": "~1.0.3",
+        "http-errors": "~1.6.2",
+        "mime-types": "~2.1.17",
+        "parseurl": "~1.3.2"
+      },
+      "engines": {
+        "node": ">= 0.8.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
+      }
+    },
+    "node_modules/serve-index/node_modules/depd": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
+      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/http-errors": {
+      "version": "1.6.3",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
+      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
+      "dependencies": {
+        "depd": "~1.1.2",
+        "inherits": "2.0.3",
+        "setprototypeof": "1.1.0",
+        "statuses": ">= 1.4.0 < 2"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/serve-index/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
+    "node_modules/serve-index/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/serve-index/node_modules/setprototypeof": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
+      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
+    },
     "node_modules/serve-static": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
@@ -15280,7 +20699,6 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
-      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -15297,7 +20715,6 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
-      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -15312,7 +20729,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
       "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
-      "dev": true,
       "dependencies": {
         "dunder-proto": "^1.0.1",
         "es-errors": "^1.3.0",
@@ -15383,7 +20799,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
       "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
-      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3",
@@ -15402,7 +20817,6 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
       "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
-      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3"
@@ -15418,7 +20832,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
       "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -15436,7 +20849,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
       "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -15538,6 +20950,21 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/sockjs": {
+      "version": "0.3.24",
+      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
+      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
+      "dependencies": {
+        "faye-websocket": "^0.11.3",
+        "uuid": "^8.3.2",
+        "websocket-driver": "^0.7.4"
+      }
+    },
+    "node_modules/source-list-map": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
+      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
+    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -15554,6 +20981,26 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/source-map-loader": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
+      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
+      "dependencies": {
+        "abab": "^2.0.5",
+        "iconv-lite": "^0.6.3",
+        "source-map-js": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
     "node_modules/source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -15571,6 +21018,55 @@
         "node": ">=0.10.0"
       }
     },
+    "node_modules/spdy": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
+      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "handle-thing": "^2.0.0",
+        "http-deceiver": "^1.2.7",
+        "select-hose": "^2.0.0",
+        "spdy-transport": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6.0.0"
+      }
+    },
+    "node_modules/spdy-transport": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
+      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
+      "dependencies": {
+        "debug": "^4.1.0",
+        "detect-node": "^2.0.4",
+        "hpack.js": "^2.1.6",
+        "obuf": "^1.1.2",
+        "readable-stream": "^3.0.6",
+        "wbuf": "^1.7.3"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/readable-stream": {
+      "version": "3.6.2",
+      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
+      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
+      "dependencies": {
+        "inherits": "^2.0.3",
+        "string_decoder": "^1.1.1",
+        "util-deprecate": "^1.0.1"
+      },
+      "engines": {
+        "node": ">= 6"
+      }
+    },
+    "node_modules/spdy-transport/node_modules/string_decoder": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
+      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
+      "dependencies": {
+        "safe-buffer": "~5.2.0"
+      }
+    },
     "node_modules/split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
@@ -15607,6 +21103,12 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
+    "node_modules/stable": {
+      "version": "0.1.8",
+      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
+      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
+      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
+    },
     "node_modules/stable-hash": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz",
@@ -15699,6 +21201,15 @@
         "node": ">= 0.6"
       }
     },
+    "node_modules/stream-browserify": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
+      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
+      "dependencies": {
+        "inherits": "~2.0.1",
+        "readable-stream": "^1.0.27-1"
+      }
+    },
     "node_modules/stream-buffers": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
@@ -15716,6 +21227,11 @@
         "node": ">=4"
       }
     },
+    "node_modules/string_decoder": {
+      "version": "0.10.31",
+      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
+      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
+    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -15739,6 +21255,11 @@
         "node": ">=8"
       }
     },
+    "node_modules/string-range": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz",
+      "integrity": "sha512-tYft6IFi8SjplJpxCUxyqisD3b+R2CSkomrtJYCkvuf1KuCAWgz7YXt4O0jip7efpfCemwHEzTEAO8EuOYgh3w=="
+    },
     "node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -15826,7 +21347,6 @@
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
       "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -15847,7 +21367,6 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
       "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -15865,7 +21384,6 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -15963,6 +21481,41 @@
       "resolved": "https://registry.npmjs.org/structured-headers/-/structured-headers-0.4.1.tgz",
       "integrity": "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg=="
     },
+    "node_modules/style-loader": {
+      "version": "3.3.4",
+      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
+      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^5.0.0"
+      }
+    },
+    "node_modules/stylehacks": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
+      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
+      "dependencies": {
+        "browserslist": "^4.21.4",
+        "postcss-selector-parser": "^6.0.4"
+      },
+      "engines": {
+        "node": "^10 || ^12 || >=14.0"
+      },
+      "peerDependencies": {
+        "postcss": "^8.2.15"
+      }
+    },
+    "node_modules/styleq": {
+      "version": "0.1.3",
+      "resolved": "https://registry.npmjs.org/styleq/-/styleq-0.1.3.tgz",
+      "integrity": "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA=="
+    },
     "node_modules/sucrase": {
       "version": "3.35.0",
       "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.35.0.tgz",
@@ -16335,7 +21888,6 @@
       "version": "5.3.11",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
       "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
-      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -16369,7 +21921,6 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
-      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -16383,7 +21934,6 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -16432,6 +21982,12 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
+    "node_modules/text-table": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
+      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
+      "peer": true
+    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
@@ -16461,6 +22017,28 @@
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
+    "node_modules/thunky": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
+      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
+    },
+    "node_modules/timers-browserify": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
+      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
+      "dependencies": {
+        "process": "~0.11.0"
+      },
+      "engines": {
+        "node": ">=0.6.0"
+      }
+    },
+    "node_modules/tiny-queue": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.0.tgz",
+      "integrity": "sha512-ucfrvjzfbtc+xqmn95DEUtGcDHJHQgZ9IR0mizPOZBkY45reZDCJjafUGVJOGJassjn0MavTyWOCQcG+agpLxw==",
+      "peer": true
+    },
     "node_modules/tinyglobby": {
       "version": "0.2.12",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
@@ -16543,14 +22121,31 @@
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.2.0.tgz",
       "integrity": "sha512-CJ1QgKmNg3CwvAv/kOFmtnEN05f0D/cn9QntgNOQlQF9dgvVTHj3t+8JPdjqawCHk7V/KA+fbUqzZ9XWhcqPUg==",
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">= 4.0.0"
+      }
+    },
+    "node_modules/tr46": {
+      "version": "0.0.3",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
+      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
+    },
+    "node_modules/traverse": {
+      "version": "0.6.11",
+      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
+      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
+      "peer": true,
+      "dependencies": {
+        "gopd": "^1.2.0",
+        "typedarray.prototype.slice": "^1.0.5",
+        "which-typed-array": "^1.1.18"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/tr46": {
-      "version": "0.0.3",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
-      "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
-    },
     "node_modules/ts-api-utils": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
@@ -16579,6 +22174,11 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
+    "node_modules/tty-browserify": {
+      "version": "0.0.0",
+      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
+      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
+    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -16610,11 +22210,22 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
+    "node_modules/type-is": {
+      "version": "1.6.18",
+      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
+      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
+      "dependencies": {
+        "media-typer": "0.3.0",
+        "mime-types": "~2.1.24"
+      },
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
       "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -16628,7 +22239,6 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
       "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
@@ -16647,7 +22257,6 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
       "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
-      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -16668,7 +22277,6 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
       "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
-      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
@@ -16684,6 +22292,33 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
+    "node_modules/typedarray": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
+      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
+    },
+    "node_modules/typedarray.prototype.slice": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
+      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
+      "peer": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.9",
+        "es-errors": "^1.3.0",
+        "get-proto": "^1.0.1",
+        "math-intrinsics": "^1.1.0",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
+    },
     "node_modules/typescript": {
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
@@ -16748,7 +22383,6 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
       "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
@@ -16889,15 +22523,38 @@
         "browserslist": ">= 4.21.0"
       }
     },
+    "node_modules/update-check": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.3.tgz",
+      "integrity": "sha512-6KLU4/dd0Tg/l0xwL+f9V7kEIPSL1vOIbnNnhSLiRDlj4AVG6Ks9Zoc9Jgt9kIgWFPZ/wp2AHgmG7xNf15TJOA==",
+      "dependencies": {
+        "registry-auth-token": "3.3.2",
+        "registry-url": "3.1.0"
+      }
+    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
       "integrity": "sha512-7rKUyy33Q1yc98pQ1DAmLtwX109F7TIfWlW1Ydo8Wl1ii1SeHieeh0HHfPeL2fMXK6z0s8ecKs9frCuLJvndBg==",
-      "dev": true,
       "dependencies": {
         "punycode": "^2.1.0"
       }
     },
+    "node_modules/url": {
+      "version": "0.10.3",
+      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
+      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
+      "dependencies": {
+        "punycode": "1.3.2",
+        "querystring": "0.2.0"
+      }
+    },
+    "node_modules/url-join": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
+      "integrity": "sha512-EGXjXJZhIHiQMK2pQukuFcL303nskqIRzWvPvV5O8miOfwoUb9G+a/Cld60kUyeaybEI94wvVClT10DtfeAExA==",
+      "peer": true
+    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -16907,6 +22564,11 @@
         "requires-port": "^1.0.0"
       }
     },
+    "node_modules/url/node_modules/punycode": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
+      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
+    },
     "node_modules/use-latest-callback": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.2.3.tgz",
@@ -16925,11 +22587,34 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
+    "node_modules/utf8": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
+      "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
+    },
+    "node_modules/util": {
+      "version": "0.10.4",
+      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
+      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
+      "dependencies": {
+        "inherits": "2.0.3"
+      }
+    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
+    "node_modules/util/node_modules/inherits": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
+      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
+    },
+    "node_modules/utila": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
+      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
+    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -16959,6 +22644,12 @@
         "node": ">=10.12.0"
       }
     },
+    "node_modules/valid-url": {
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
+      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==",
+      "peer": true
+    },
     "node_modules/validate-npm-package-name": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
@@ -16980,6 +22671,14 @@
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
       "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
     },
+    "node_modules/vm-browserify": {
+      "version": "0.0.4",
+      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
+      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
+      "dependencies": {
+        "indexof": "0.0.1"
+      }
+    },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -17009,7 +22708,6 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
       "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
-      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -17018,6 +22716,14 @@
         "node": ">=10.13.0"
       }
     },
+    "node_modules/wbuf": {
+      "version": "1.7.3",
+      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
+      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
+      "dependencies": {
+        "minimalistic-assert": "^1.0.0"
+      }
+    },
     "node_modules/wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -17043,7 +22749,6 @@
       "version": "5.98.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
       "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
-      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -17085,11 +22790,242 @@
         }
       }
     },
+    "node_modules/webpack-dev-middleware": {
+      "version": "5.3.4",
+      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
+      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
+      "dependencies": {
+        "colorette": "^2.0.10",
+        "memfs": "^3.4.3",
+        "mime-types": "^2.1.31",
+        "range-parser": "^1.2.1",
+        "schema-utils": "^4.0.0"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.0.0 || ^5.0.0"
+      }
+    },
+    "node_modules/webpack-dev-server": {
+      "version": "4.15.2",
+      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
+      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
+      "dependencies": {
+        "@types/bonjour": "^3.5.9",
+        "@types/connect-history-api-fallback": "^1.3.5",
+        "@types/express": "^4.17.13",
+        "@types/serve-index": "^1.9.1",
+        "@types/serve-static": "^1.13.10",
+        "@types/sockjs": "^0.3.33",
+        "@types/ws": "^8.5.5",
+        "ansi-html-community": "^0.0.8",
+        "bonjour-service": "^1.0.11",
+        "chokidar": "^3.5.3",
+        "colorette": "^2.0.10",
+        "compression": "^1.7.4",
+        "connect-history-api-fallback": "^2.0.0",
+        "default-gateway": "^6.0.3",
+        "express": "^4.17.3",
+        "graceful-fs": "^4.2.6",
+        "html-entities": "^2.3.2",
+        "http-proxy-middleware": "^2.0.3",
+        "ipaddr.js": "^2.0.1",
+        "launch-editor": "^2.6.0",
+        "open": "^8.0.9",
+        "p-retry": "^4.5.0",
+        "rimraf": "^3.0.2",
+        "schema-utils": "^4.0.0",
+        "selfsigned": "^2.1.1",
+        "serve-index": "^1.9.1",
+        "sockjs": "^0.3.24",
+        "spdy": "^4.0.2",
+        "webpack-dev-middleware": "^5.3.4",
+        "ws": "^8.13.0"
+      },
+      "bin": {
+        "webpack-dev-server": "bin/webpack-dev-server.js"
+      },
+      "engines": {
+        "node": ">= 12.13.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/webpack"
+      },
+      "peerDependencies": {
+        "webpack": "^4.37.0 || ^5.0.0"
+      },
+      "peerDependenciesMeta": {
+        "webpack": {
+          "optional": true
+        },
+        "webpack-cli": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/default-gateway": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
+      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
+      "dependencies": {
+        "execa": "^5.0.0"
+      },
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
+      "dependencies": {
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
+      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
+      "engines": {
+        "node": ">= 10"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
+      "dependencies": {
+        "path-key": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
+      "dependencies": {
+        "mimic-fn": "^2.1.0"
+      },
+      "engines": {
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/open": {
+      "version": "8.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
+      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
+      "dependencies": {
+        "define-lazy-prop": "^2.0.0",
+        "is-docker": "^2.1.1",
+        "is-wsl": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/webpack-dev-server/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    },
+    "node_modules/webpack-manifest-plugin": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
+      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
+      "dependencies": {
+        "tapable": "^2.0.0",
+        "webpack-sources": "^2.2.0"
+      },
+      "engines": {
+        "node": ">=12.22.0"
+      },
+      "peerDependencies": {
+        "webpack": "^4.44.2 || ^5.47.0"
+      }
+    },
+    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
+    },
+    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
+      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
+      "dependencies": {
+        "source-list-map": "^2.0.1",
+        "source-map": "^0.6.1"
+      },
+      "engines": {
+        "node": ">=10.13.0"
+      }
+    },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
-      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -17098,7 +23034,6 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
-      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -17111,11 +23046,31 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
-      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
     },
+    "node_modules/websocket-driver": {
+      "version": "0.7.4",
+      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
+      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
+      "dependencies": {
+        "http-parser-js": ">=0.5.1",
+        "safe-buffer": ">=5.1.0",
+        "websocket-extensions": ">=0.1.1"
+      },
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/websocket-extensions": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
+      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
@@ -17188,7 +23143,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
       "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
-      "dev": true,
       "dependencies": {
         "is-bigint": "^1.1.0",
         "is-boolean-object": "^1.2.1",
@@ -17207,7 +23161,6 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
       "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
-      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "function.prototype.name": "^1.1.6",
@@ -17234,7 +23187,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
       "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
-      "dev": true,
       "dependencies": {
         "is-map": "^2.0.3",
         "is-set": "^2.0.3",
@@ -17252,7 +23204,6 @@
       "version": "1.1.18",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
       "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
-      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -17480,6 +23431,15 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xtend": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
+      "peer": true,
+      "engines": {
+        "node": ">=0.4"
+      }
+    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
diff --git a/package.json b/package.json
index 2dc1999..bb22b00 100644
--- a/package.json
+++ b/package.json
@@ -21,10 +21,12 @@
     "@expo-google-fonts/poppins": "^0.2.3",
     "@pharmatech/sdk": "^0.4.3",
     "@reduxjs/toolkit": "^2.6.1",
+    "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
     "expo-font": "~13.0.4",
+    "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
     "expo-location": "^18.0.10",
     "expo-modules-core": "^2.2.2",
@@ -47,8 +49,7 @@
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17",
-    "expo-image-picker": "~16.0.6"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 5980d0b..da07fc8 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -12,7 +12,7 @@ import PoppinsText from '../components/PoppinsText';
 import Input from '../components/Input';
 import Button from '../components/Button';
 import { UserService } from '../services/user';
-import { UserList } from '@pharmatech/sdk';
+import { UpdateUser, UserList } from '@pharmatech/sdk';
 import { PencilIcon, TrashIcon } from 'react-native-heroicons/outline';
 import { useRouter } from 'expo-router';
 import DatePickerInput from '../components/DatePickerInput';
@@ -23,6 +23,7 @@ import {
   validateRequiredFields,
 } from '../utils/validators';
 import Alert from '../components/Alerts';
+import { ImageService } from '../services/images';
 
 const formatDate = (dateString: Date): string => {
   const date = new Date(dateString);
@@ -49,6 +50,7 @@ const ProfileScreen = () => {
 
         if (profile.success) {
           setProfile(profile.data);
+          setImage(profile.data.profile.profilePicture);
         }
       } catch (error) {
         console.log(error);
@@ -87,13 +89,20 @@ const ProfileScreen = () => {
     }
     setLoading(true);
     try {
-      const updatedProfile = {
+      const updatedProfile: Partial<UpdateUser> = {
         firstName: profile.firstName,
         lastName: profile.lastName,
         birthDate: profile.profile?.birthDate.toString(),
         phoneNumber: profile.phoneNumber,
+        profilePicture: undefined,
       };
 
+      if (image !== null) {
+        const imageResponse = await ImageService.uploadImage(image);
+        if (imageResponse)
+          updatedProfile.profilePicture = imageResponse.secure_url;
+      }
+
       const response = await UserService.updateProfile(updatedProfile);
 
       if (response.success) {
@@ -177,11 +186,14 @@ const ProfileScreen = () => {
                 position: 'absolute',
                 zIndex: 999,
               }}
+              onPress={() => {
+                setImage(null);
+              }}
             >
               <TrashIcon color={Colors.iconWhite} size={20} />
             </TouchableOpacity>
             <Image
-              source={{ uri: image ? image : profile.profile.profilePicture }}
+              source={{ uri: image ? image : '' }}
               style={{ width: 80, height: 80, borderRadius: 100 }}
             />
           </View>
diff --git a/src/services/images.ts b/src/services/images.ts
new file mode 100644
index 0000000..aee06c2
--- /dev/null
+++ b/src/services/images.ts
@@ -0,0 +1,41 @@
+import { upload } from 'cloudinary-react-native';
+import { Cloudinary } from '@cloudinary/url-gen';
+import {
+  UploadApiErrorResponse,
+  UploadApiResponse,
+} from 'cloudinary-react-native/lib/typescript/src/api/upload/model/params/upload-params';
+
+export const ImageService = {
+  uploadImage: async (
+    image: string,
+  ): Promise<UploadApiResponse | undefined> => {
+    try {
+      const cld = new Cloudinary({
+        cloud: {
+          cloudName: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME,
+          apiKey: process.env.CLOUDINARY_API_KEY,
+          apiSecret: process.env.CLOUDINARY_API_SECRET,
+        },
+        url: {
+          secure: true,
+        },
+      });
+
+      let cloudinaryResponse;
+
+      await upload(cld, {
+        file: image,
+        callback: (
+          error?: UploadApiErrorResponse,
+          response?: UploadApiResponse,
+        ) => {
+          cloudinaryResponse = response;
+        },
+      });
+
+      return cloudinaryResponse;
+    } catch (error) {
+      console.log(error);
+    }
+  },
+};

From 5a9ca68a0db4ad5c0e53f3a8c3a6190c804a16eb Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 19 Apr 2025 23:20:24 -0400
Subject: [PATCH 127/291] Refactor CheckoutScreen to remove unused userName
 state and related effect; clean up order service imports and improve code
 formatting.

---
 src/screens/CheckoutScreen.tsx | 30 ++++++++----------------------
 src/services/order.ts          |  2 +-
 2 files changed, 9 insertions(+), 23 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 4b21ade..500a4dd 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
 import {
   ShoppingBagIcon,
@@ -39,7 +39,7 @@ const CheckoutScreen = () => {
   const [couponDiscount, setCouponDiscount] = useState(0);
   const [isCouponApplied, setIsCouponApplied] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [userName, setUserName] = useState<string | null>('Usuario');
+  const [userName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<{
     name: string;
@@ -47,16 +47,6 @@ const CheckoutScreen = () => {
     longitude: number;
   } | null>(null);
 
-  useEffect(() => {
-    const fetchUserName = async () => {
-      const storedUserName = await localStorage.getItem('userName');
-      if (storedUserName) {
-        setUserName(storedUserName);
-      }
-    };
-    fetchUserName();
-  }, []);
-
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
     (selectedOption === 'delivery' && selectedPayment === 'efectivo');
@@ -124,14 +114,14 @@ const CheckoutScreen = () => {
           setErrorMessage(null);
 
           const products: CreateOrderDetail[] = cartItems
-            .filter((item) => item.quantity > 0) // Filtrar productos con cantidad válida
+            .filter((item) => item.quantity > 0)
             .map((item) => ({
-              productPresentationId: item.id, // Asegúrate de que `id` sea el identificador correcto
-              quantity: item.quantity, // Usar la cantidad directamente
+              productPresentationId: item.id, //
+              quantity: item.quantity,
             }));
 
           if (products.length === 0) {
-            console.error('No hay productos válidos para procesar el pedido.'); // Depuración
+            console.error('No hay productos válidos para procesar el pedido.');
             setErrorMessage('No hay productos válidos en el carrito.');
             setStatus('rejected');
             return;
@@ -155,12 +145,8 @@ const CheckoutScreen = () => {
             products,
           };
 
-          console.log('Payload enviado al backend:', orderPayload); // Depuración
-
           const orderResponse = await OrderService.create(orderPayload);
 
-          console.log('Respuesta del backend:', orderResponse); // Depuración
-
           if (!orderResponse.success || !orderResponse.data?.id) {
             setErrorMessage(
               'No pudimos procesar tu orden. Inténtalo nuevamente.',
@@ -173,7 +159,7 @@ const CheckoutScreen = () => {
           setStatus('approved');
           setCurrentStep(stepsLabels.length);
         } catch (error) {
-          console.error('Error al procesar la orden:', error); // Depuración
+          console.error('Error al procesar la orden:', error);
           setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
           setStatus('rejected');
         }
@@ -385,7 +371,7 @@ const CheckoutScreen = () => {
             <PaymentStatusMessage
               status={status}
               orderNumber={'N/A'}
-              userName={userName || 'Usuario'} // Ensure the correct userName is passed
+              userName={userName || 'Usuario'}
             />
             <View style={styles.confirmationContainer}>
               {renderConfirmationContent(status)}
diff --git a/src/services/order.ts b/src/services/order.ts
index c5a49b5..a551a67 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -18,10 +18,10 @@ export const OrderService = {
       }
 
       console.log('Sending order creation request:', order);
+
       const response = await api.order.create(order, token);
 
       if (!response?.id) {
-        // Use the corrected property name
         console.error('Order creation response missing id:', response);
         return {
           success: false,

From ab9310ac606960105f9b2577a8718e9aa4708fa5 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 19 Apr 2025 23:59:56 -0400
Subject: [PATCH 128/291] Added images

---
 src/assets/images/notifications/e.jpg     | Bin 0 -> 3343 bytes
 src/assets/images/notifications/f.jpg     | Bin 0 -> 3280 bytes
 src/assets/images/notifications/image.jpg | Bin 0 -> 3426 bytes
 src/assets/images/notifications/m.jpg     | Bin 0 -> 3975 bytes
 src/assets/images/notifications/r.jpg     | Bin 0 -> 2772 bytes
 src/assets/images/notifications/w.jpg     | Bin 0 -> 3916 bytes
 src/screens/NotificationsScreen.tsx       |   3 ---
 7 files changed, 3 deletions(-)
 create mode 100644 src/assets/images/notifications/e.jpg
 create mode 100644 src/assets/images/notifications/f.jpg
 create mode 100644 src/assets/images/notifications/image.jpg
 create mode 100644 src/assets/images/notifications/m.jpg
 create mode 100644 src/assets/images/notifications/r.jpg
 create mode 100644 src/assets/images/notifications/w.jpg

diff --git a/src/assets/images/notifications/e.jpg b/src/assets/images/notifications/e.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..5627eb74a65577eca8fb3dc254a251328920e9d0
GIT binary patch
literal 3343
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
PF?J?;$zz|-2xtBY3pPOv

literal 0
HcmV?d00001

diff --git a/src/assets/images/notifications/f.jpg b/src/assets/images/notifications/f.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..a6d4bdda93ea3cb6271869064fa055fc6c0ef7af
GIT binary patch
literal 3280
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
L+EiIR<4yb%8*nY2

literal 0
HcmV?d00001

diff --git a/src/assets/images/notifications/image.jpg b/src/assets/images/notifications/image.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..1c86b1c61bb0e20d9af4720474579c5c79690790
GIT binary patch
literal 3426
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/notifications/m.jpg b/src/assets/images/notifications/m.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..392082c1cacb7870420ff99f24fd9f6e8a42c68f
GIT binary patch
literal 3975
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

literal 0
HcmV?d00001

diff --git a/src/assets/images/notifications/r.jpg b/src/assets/images/notifications/r.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..fb2363585ae57a073d5694da49854eacc8c2b260
GIT binary patch
literal 2772
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
KUmXDy6aNHZ8aKuO

literal 0
HcmV?d00001

diff --git a/src/assets/images/notifications/w.jpg b/src/assets/images/notifications/w.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6e581e70ebf3e5c3e994e96c512ab871b9a69a43
GIT binary patch
literal 3916
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

literal 0
HcmV?d00001

diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 89ecb42..efcf2b6 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -7,9 +7,6 @@ import { NotificationService } from '../services/notifications';
 import { NotificationResponse } from '@pharmatech/sdk';
 
 export default function NotificationsScreen() {
-  /* const [notificationsList, setNotificationsList] = useState<OrderResponse[] | undefined>(
-		undefined,
-	); */
   const [notificationsList, setNotificationsList] = useState<
     Partial<NotificationResponse>[] | undefined
   >([

From 088af5497a87a411c79e2a691e8742096a3e3b4d Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 20 Apr 2025 19:23:28 -0400
Subject: [PATCH 129/291] Changes to locationSelector and refactoring some
 services to use sdk types

---
 package-lock.json                   |  9 +--
 package.json                        |  6 +-
 src/components/LocationSelector.tsx | 95 ++++++++++++++++++-----------
 src/screens/CheckoutScreen.tsx      | 27 ++++++--
 src/screens/tab/HomeScreen.tsx      |  8 ++-
 src/services/branches.ts            | 31 ++--------
 src/services/coupon.ts              | 18 ++----
 src/services/order.ts               | 31 +++-------
 src/services/paymentConfirmation.ts | 61 +++++++-----------
 src/services/paymentInformation.ts  | 21 ++-----
 10 files changed, 140 insertions(+), 167 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ea0c4f3..fe72bd4 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.3",
+        "@pharmatech/sdk": "^0.4.4",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3587,9 +3587,10 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.3.tgz",
-      "integrity": "sha512-T1oXLTsPpjzKse9esvHiN1c7qgQDf7TvF6PO+gd4bUpaK8HlCZ29evtB5kQ5t2X39wEa6aQNMgYcE/ka/AoGXw==",
+      "version": "0.4.4",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.4.tgz",
+      "integrity": "sha512-kquo9r+V2JFvk8AQ99RhH88qI50TIiRY4UrLYrDkC2yLUSCpJrBoA9PEe8b8W8Zt3E9BpzqHEbbZ+7tp7l+ZhA==",
+      "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 2dc1999..b6ea0ed 100644
--- a/package.json
+++ b/package.json
@@ -19,12 +19,13 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.3",
+    "@pharmatech/sdk": "^0.4.4",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
     "expo-font": "~13.0.4",
+    "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
     "expo-location": "^18.0.10",
     "expo-modules-core": "^2.2.2",
@@ -47,8 +48,7 @@
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
-    "tailwindcss": "^3.4.17",
-    "expo-image-picker": "~16.0.6"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index c02c4f0..046e8a9 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -22,20 +22,21 @@ const LocationSelector = ({
   onSelect,
   setSelectedBranch,
 }: {
-  selectedOption: 'pickup' | 'delivery' | null;
+  selectedOption: 'pickup' | 'delivery';
   onSelect: (value: string | null) => void;
-  setSelectedBranch: (branch: Branch | null) => void; // Prop type
+  setSelectedBranch: (branch: Branch | null) => void;
 }) => {
   const router = useRouter();
   const [pickupBranches, setPickupBranches] = useState<Branch[]>([]);
   const [deliveryAddresses, setDeliveryAddresses] = useState<
     { id: string; address: string }[]
-  >([]); // Store both UUID and address
+  >([]);
   const [dropdownKey, setDropdownKey] = useState(0);
   const [modalVisible, setModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranchState] = useState<Branch | null>(
     null,
   );
+  const [noAddresses, setNoAddresses] = useState(false);
 
   useEffect(() => {
     const resetState = async () => {
@@ -46,32 +47,45 @@ const LocationSelector = ({
       if (selectedOption === 'pickup') {
         try {
           const response = await BranchService.findAll({});
-          if (response.success) {
-            setPickupBranches(response.data.results);
-          } else {
-            console.error('Error fetching branches:', response.error);
-          }
+
+          // Mapear las sucursales al formato esperado
+          const branches = response.results.map((branch) => ({
+            id: branch.id,
+            name: branch.name,
+            latitude: branch.latitude,
+            longitude: branch.longitude,
+          }));
+
+          setPickupBranches(branches);
         } catch (error) {
-          console.error('Error fetching branches:', extractErrorMessage(error));
+          console.error(
+            'Error al obtener sucursales:',
+            extractErrorMessage(error),
+          );
+          setPickupBranches([]); // Asegúrate de limpiar el estado en caso de error
         }
       } else if (selectedOption === 'delivery') {
         try {
           const response = await UserService.getUserDirections();
-          if (response.success) {
-            setDeliveryAddresses(
-              response.data.map((address) => ({
-                id: address.id,
-                address: address.adress,
-              })),
-            );
+
+          if (!response.success || response.data.length === 0) {
+            setNoAddresses(true);
+            setDeliveryAddresses([]);
           } else {
-            console.error('Error fetching addresses:', response.error);
+            setNoAddresses(false);
+            const addresses = response.data.map((address) => ({
+              id: address.id,
+              address: address.adress,
+            }));
+            setDeliveryAddresses(addresses);
           }
         } catch (error) {
           console.error(
-            'Error fetching addresses:',
+            'Error al obtener direcciones:',
             extractErrorMessage(error),
           );
+          setNoAddresses(true);
+          setDeliveryAddresses([]);
         }
       }
     };
@@ -84,35 +98,45 @@ const LocationSelector = ({
       ? pickupBranches.map((branch) => branch.name)
       : deliveryAddresses.map((item) => item.address);
 
-  if (!selectedOption) return null;
-
   return (
     <View style={styles.container}>
       <PoppinsText style={styles.label}>
         {selectedOption === 'pickup'
           ? 'Seleccione la sucursal'
-          : 'Seleccione la dirección de entrega'}
+          : noAddresses
+            ? 'No se encontraron direcciones registradas'
+            : 'Seleccione la dirección de entrega'}
       </PoppinsText>
 
-      <Dropdown
-        key={dropdownKey}
-        options={options}
-        placeholder="Selecciona una opción"
-        onSelect={(val) => {
-          if (selectedOption === 'pickup') {
+      {selectedOption === 'pickup' && pickupBranches.length > 0 && (
+        <Dropdown
+          key={dropdownKey}
+          options={options}
+          placeholder="Selecciona una opción"
+          onSelect={(val) => {
             const branch = pickupBranches.find((b) => b.name === val);
-            setSelectedBranch(branch || null); // Update branch in parent
+            setSelectedBranch(branch || null);
             setSelectedBranchState(branch || null);
             onSelect(branch ? branch.id : null);
-          } else {
+          }}
+          borderColor={Colors.gray_100}
+        />
+      )}
+
+      {!noAddresses && selectedOption === 'delivery' && (
+        <Dropdown
+          key={dropdownKey}
+          options={options}
+          placeholder="Selecciona una opción"
+          onSelect={(val) => {
             const selectedAddress = deliveryAddresses.find(
               (item) => item.address === val,
             );
             onSelect(selectedAddress ? selectedAddress.id : null);
-          }
-        }}
-        borderColor={Colors.gray_100}
-      />
+          }}
+          borderColor={Colors.gray_100}
+        />
+      )}
 
       <TouchableOpacity
         style={styles.button}
@@ -121,7 +145,7 @@ const LocationSelector = ({
             ? setModalVisible(true)
             : router.push({
                 pathname: '/selectLocation',
-                params: { fromCheckout: 'true' }, // Convertimos a cadena
+                params: { fromCheckout: 'true' },
               })
         }
         disabled={selectedOption === 'pickup' && !selectedBranch}
@@ -136,9 +160,6 @@ const LocationSelector = ({
           style={[
             styles.buttonText,
             selectedOption === 'pickup' && styles.textWithIcon,
-            selectedOption === 'pickup' &&
-              !selectedBranch &&
-              styles.disabledText,
           ]}
         >
           {selectedOption === 'pickup'
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 500a4dd..09acd13 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -113,11 +113,12 @@ const CheckoutScreen = () => {
 
           setErrorMessage(null);
 
+          // Validar los productos del carrito
           const products: CreateOrderDetail[] = cartItems
             .filter((item) => item.quantity > 0)
             .map((item) => ({
-              productPresentationId: item.id, //
-              quantity: item.quantity,
+              productPresentationId: item.id,
+              quantity: item.quantity, // Solo incluir los campos esperados
             }));
 
           if (products.length === 0) {
@@ -127,8 +128,11 @@ const CheckoutScreen = () => {
             return;
           }
 
-          console.log('Productos enviados al backend:', products); // Depuración
+          // Log del carrito y los productos seleccionados
+          console.log('Productos en el carrito:', cartItems);
+          console.log('Productos seleccionados para la orden:', products);
 
+          // Construir el payload de la orden
           const orderPayload: CreateOrder = {
             type:
               selectedOption === 'pickup'
@@ -145,9 +149,17 @@ const CheckoutScreen = () => {
             products,
           };
 
+          // Log del payload que se enviará al backend
+          console.log('Payload enviado al backend:', orderPayload);
+
+          // Enviar la orden al backend
           const orderResponse = await OrderService.create(orderPayload);
 
-          if (!orderResponse.success || !orderResponse.data?.id) {
+          // Log de la respuesta del backend
+          console.log('Respuesta del backend:', orderResponse);
+
+          // Validar la respuesta
+          if (!orderResponse?.id) {
             setErrorMessage(
               'No pudimos procesar tu orden. Inténtalo nuevamente.',
             );
@@ -156,6 +168,8 @@ const CheckoutScreen = () => {
             return;
           }
 
+          console.log('Orden creada exitosamente:', orderResponse);
+
           setStatus('approved');
           setCurrentStep(stepsLabels.length);
         } catch (error) {
@@ -163,8 +177,9 @@ const CheckoutScreen = () => {
           setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
           setStatus('rejected');
         }
+      } else {
+        setCurrentStep(currentStep + 1);
       }
-      setCurrentStep(currentStep + 1);
     }
   };
 
@@ -319,7 +334,7 @@ const CheckoutScreen = () => {
               </View>
             </View>
             <LocationSelector
-              selectedOption={selectedOption}
+              selectedOption={selectedOption || 'pickup'}
               onSelect={(val) => setSelectedLocation(val)}
               setSelectedBranch={setSelectedBranch}
             />
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index cb71a75..717537f 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -32,9 +32,10 @@ export default function HomeScreen() {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
         id: p.product.id,
-        imageUrl: p.product.images[0].url,
+        imageUrl:
+          p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
         name: p.product.name,
-        category: p.product.categories[0].name,
+        category: p.product.categories?.[0]?.name || 'Sin categoría',
         originalPrice: p.price,
         discount: 10,
         finalPrice: p.price - p.price * 0.1,
@@ -45,7 +46,8 @@ export default function HomeScreen() {
             name: p.product.name,
             price: p.price,
             quantity,
-            image: p.product.images[0].url,
+            image:
+              p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
           });
           updateCartQuantity(p.product.id, quantity);
         },
diff --git a/src/services/branches.ts b/src/services/branches.ts
index 2bfdb3e..f88749f 100644
--- a/src/services/branches.ts
+++ b/src/services/branches.ts
@@ -1,6 +1,5 @@
-import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, Pagination, BranchResponse } from '../types/api.d';
+import { Pagination, BranchResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 type FindAllParams = {
@@ -16,32 +15,14 @@ export const BranchService = {
     limit = 100,
     q,
     stateId,
-  }: FindAllParams): Promise<ServiceResponse<Pagination<BranchResponse>>> => {
+  }: FindAllParams): Promise<Pagination<BranchResponse>> => {
     try {
-      // Obtener token JWT desde SecureStore
-      const jwt = await SecureStore.getItemAsync('auth_token');
-      if (!jwt) {
-        return {
-          success: false,
-          error: 'No se encontró el token de autenticación.',
-        };
-      }
+      const response = await api.branch.findAll({ page, limit, q, stateId });
 
-      // Llamar a la API usando los parámetros recibidos
-      const response = await api.branch.findAll(
-        { page, limit, q, stateId },
-        jwt,
-      );
-
-      return {
-        success: true,
-        data: response,
-      };
+      return response;
     } catch (error) {
-      return {
-        success: false,
-        error: extractErrorMessage(error),
-      };
+      console.error('Error en BranchService.findAll:', error);
+      throw new Error(extractErrorMessage(error));
     }
   },
 };
diff --git a/src/services/coupon.ts b/src/services/coupon.ts
index c4f3bc3..fdd0843 100644
--- a/src/services/coupon.ts
+++ b/src/services/coupon.ts
@@ -1,27 +1,21 @@
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, CouponResponse } from '../types/api.d';
+import { CouponResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const CouponService = {
-  validateCoupon: async (
-    code: string,
-  ): Promise<ServiceResponse<CouponResponse>> => {
+  validateCoupon: async (code: string): Promise<CouponResponse> => {
     try {
-      // Retrieve the JWT token from SecureStore
       const jwt = await SecureStore.getItemAsync('auth_token');
       if (!jwt) {
-        return {
-          success: false,
-          error: 'No se encontró el token de autenticación.',
-        };
+        throw new Error('No se encontró el token de autenticación.');
       }
 
-      // Call the SDK's getByCode method
       const response = await api.coupon.getByCode(code, jwt);
-      return { success: true, data: response };
+      return response;
     } catch (error) {
-      return { success: false, error: extractErrorMessage(error) };
+      console.error('Error en CouponService.validateCoupon:', error);
+      throw new Error(extractErrorMessage(error));
     }
   },
 };
diff --git a/src/services/order.ts b/src/services/order.ts
index a551a67..81b1f2d 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -1,42 +1,29 @@
 import { api } from '../lib/sdkConfig';
 import * as SecureStore from 'expo-secure-store';
-import { ServiceResponse, CreateOrder, OrderResponse } from '../types/api.d';
+import { CreateOrder, OrderResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const OrderService = {
-  create: async (
-    order: CreateOrder,
-  ): Promise<ServiceResponse<OrderResponse>> => {
+  create: async (order: CreateOrder): Promise<OrderResponse> => {
     try {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
-        console.warn('Auth token not found in SecureStore');
-        return {
-          success: false,
-          error: 'Token de autenticación no encontrado',
-        };
+        throw new Error('Token de autenticación no encontrado');
       }
 
-      console.log('Sending order creation request:', order);
+      console.log('Enviando solicitud de creación de orden:', order);
 
       const response = await api.order.create(order, token);
 
       if (!response?.id) {
-        console.error('Order creation response missing id:', response);
-        return {
-          success: false,
-          error: 'La respuesta no contiene un ID de orden válido',
-        };
+        throw new Error('La respuesta no contiene un ID de orden válido');
       }
 
-      console.log('Order creation response:', response);
-      return { success: true, data: response };
+      console.log('Respuesta de creación de orden:', response);
+      return response;
     } catch (error) {
-      console.error('Error in OrderService.create:', error);
-      return {
-        success: false,
-        error: extractErrorMessage(error),
-      };
+      console.error('Error en OrderService.create:', error);
+      throw new Error(extractErrorMessage(error));
     }
   },
 };
diff --git a/src/services/paymentConfirmation.ts b/src/services/paymentConfirmation.ts
index 06c7491..7a8c33e 100644
--- a/src/services/paymentConfirmation.ts
+++ b/src/services/paymentConfirmation.ts
@@ -1,7 +1,6 @@
 import { api } from '../lib/sdkConfig';
 import * as SecureStore from 'expo-secure-store';
 import {
-  ServiceResponse,
   PaymentConfirmation,
   PaymentConfirmationResponse,
 } from '../types/api.d';
@@ -10,34 +9,26 @@ import { extractErrorMessage } from '../utils/errorHandler';
 export const PaymentConfirmationService = {
   create: async (
     paymentConfirmation: PaymentConfirmation,
-  ): Promise<ServiceResponse<PaymentConfirmationResponse>> => {
+  ): Promise<PaymentConfirmationResponse> => {
     try {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
-        console.warn('Auth token not found in SecureStore');
-        return {
-          success: false,
-          error: 'Token de autenticación no encontrado',
-        };
+        throw new Error('Token de autenticación no encontrado');
       }
 
-      console.log('Sending payment confirmation request:', paymentConfirmation);
+      console.log('Enviando confirmación de pago:', paymentConfirmation);
 
-      // Validate paymentConfirmation
-      if (
-        !paymentConfirmation.documentId ||
-        !paymentConfirmation.phoneNumber ||
-        !paymentConfirmation.bank ||
-        !paymentConfirmation.reference
-      ) {
-        console.error(
-          'Invalid payment confirmation payload:',
-          paymentConfirmation,
-        );
-        return {
-          success: false,
-          error: 'Datos de confirmación de pago inválidos',
-        };
+      // Validar el payload
+      const requiredFields: (keyof PaymentConfirmation)[] = [
+        'documentId',
+        'phoneNumber',
+        'bank',
+        'reference',
+      ];
+      for (const field of requiredFields) {
+        if (!paymentConfirmation[field]) {
+          throw new Error(`El campo ${field} es obligatorio`);
+        }
       }
 
       const response = await api.paymentConfirmation.create(
@@ -45,27 +36,17 @@ export const PaymentConfirmationService = {
         token,
       );
 
-      // Adjust validation based on actual response structure
-      if (!response || !response.id) {
-        console.error(
-          'Payment confirmation failed: Missing ID in response',
-          response,
+      if (!response?.id) {
+        throw new Error(
+          'La respuesta no contiene un ID de confirmación válido',
         );
-        return {
-          success: false,
-          error:
-            'Error en la confirmación del pago: Falta el ID en la respuesta',
-        };
       }
 
-      console.log('Payment confirmation response:', response);
-      return { success: true, data: response };
+      console.log('Respuesta de confirmación de pago:', response);
+      return response;
     } catch (error) {
-      console.error('Error in PaymentConfirmationService.create:', error);
-      return {
-        success: false,
-        error: extractErrorMessage(error),
-      };
+      console.error('Error en PaymentConfirmationService.create:', error);
+      throw new Error(extractErrorMessage(error));
     }
   },
 };
diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index 32b9977..be9c1f0 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -1,35 +1,26 @@
 import { api } from '../lib/sdkConfig';
 import * as SecureStore from 'expo-secure-store';
-import {
-  ServiceResponse,
-  PaymentInformation,
-  PaymentMethod,
-} from '../types/api.d';
+import { PaymentInformation, PaymentMethod } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const PaymentInformationService = {
   findAll: async (
     paymentMethod?: PaymentMethod,
-  ): Promise<ServiceResponse<PaymentInformation[]>> => {
+  ): Promise<PaymentInformation[]> => {
     try {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
-        return {
-          success: false,
-          error: 'Token de autenticación no encontrado',
-        };
+        throw new Error('Token de autenticación no encontrado');
       }
 
       const response = await api.paymentInformation.findAll({
         paymentMethod,
       });
 
-      return { success: true, data: response.results };
+      return response.results;
     } catch (error) {
-      return {
-        success: false,
-        error: extractErrorMessage(error),
-      };
+      console.error('Error en PaymentInformationService.findAll:', error);
+      throw new Error(extractErrorMessage(error));
     }
   },
 };

From 9647d667b487349b1647d225716c2d147a0fce54 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 20 Apr 2025 19:39:50 -0400
Subject: [PATCH 130/291] Adapting app to show maps in iOS

---
 app.json | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/app.json b/app.json
index 2a4442e..d206435 100644
--- a/app.json
+++ b/app.json
@@ -14,6 +14,9 @@
       "backgroundColor": "#1C2143"
     },
     "ios": {
+      "config": {
+        "googleMapsApiKey": "process.env.GOOGLE_MAPS_API_KEY"
+      },
       "supportsTablet": true
     },
     "android": {

From 3f81f86f222d5576117f105d6208658330d57d7a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 20 Apr 2025 22:45:54 -0400
Subject: [PATCH 131/291] Fixing some inconsistencies

---
 src/components/Card.tsx             | 10 +++-
 src/components/Coupon.tsx           | 58 ++++++++++++---------
 src/screens/OrdersScreen.tsx        | 81 ++++++-----------------------
 src/screens/ProductDetailScreen.tsx | 28 +++++++---
 src/screens/tab/HomeScreen.tsx      |  9 ++--
 src/types/Product.ts                |  1 +
 6 files changed, 85 insertions(+), 102 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 760b127..7ad7ca3 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -10,6 +10,7 @@ import { useRouter } from 'expo-router';
 
 const ProductCard: React.FC<Product> = ({
   id,
+  productId, // productId
   imageUrl,
   name,
   category,
@@ -21,7 +22,14 @@ const ProductCard: React.FC<Product> = ({
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
   return (
-    <TouchableOpacity onPress={() => router.push('/products/' + id)}>
+    <TouchableOpacity
+      onPress={() =>
+        router.push({
+          pathname: '/products/' + productId, // Usar el productId en el path
+          params: { productPresentationId: id }, // Pasar el productPresentationId como parámetro
+        })
+      }
+    >
       <View style={styles.card}>
         <View
           style={{
diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index 480dad1..947fb63 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -28,18 +28,32 @@ const Coupon: React.FC<CouponProps> = ({
       setLoading(true);
       setValidationMessage(null);
 
-      const response = await CouponService.validateCoupon(couponCode.trim());
-      setLoading(false);
+      try {
+        // Llamar al servicio para validar el cupón
+        const response = await CouponService.validateCoupon(couponCode.trim());
 
-      if (response.success) {
-        const discount = response.data.discount;
-        setValidationMessage(
-          `Cupón válido. Se aplicó un descuento de ${discount}$ .`,
-        );
-        onApplyCoupon(discount);
-        onCouponApplied();
-      } else {
-        setValidationMessage('Cupón inválido'); // Mensaje personalizado de error
+        // Manejar la respuesta del servicio
+        if (response) {
+          const { discount, expirationDate } = response;
+          const isExpired = new Date(expirationDate) < new Date();
+
+          if (isExpired) {
+            setValidationMessage('El cupón ha expirado.');
+          } else {
+            setValidationMessage(
+              `Cupón válido. Se aplicó un descuento de ${discount}$.`,
+            );
+            onApplyCoupon(discount);
+            onCouponApplied();
+          }
+        } else {
+          setValidationMessage('Cupón inválido.');
+        }
+      } catch (error) {
+        setValidationMessage('Error al validar el cupón.');
+        console.error('Error en handleApply:', error);
+      } finally {
+        setLoading(false);
       }
     }
   };
@@ -50,20 +64,7 @@ const Coupon: React.FC<CouponProps> = ({
     <View style={styles.container}>
       <PoppinsText style={styles.label}>Ingresa el Cupón</PoppinsText>
       <View style={styles.row}>
-        <View
-          style={[
-            styles.inputWrapper,
-            {
-              borderColor: Colors.gray_100,
-              borderWidth: 1,
-              borderRadius: 8,
-              height: 44,
-              paddingHorizontal: 10,
-              justifyContent: 'center',
-              backgroundColor: Colors.menuWhite,
-            },
-          ]}
-        >
+        <View style={styles.inputWrapper}>
           <Input
             placeholder="Código de Cupón"
             value={couponCode}
@@ -116,6 +117,13 @@ const styles = StyleSheet.create({
   inputWrapper: {
     flex: 0.8,
     marginRight: 8,
+    borderColor: Colors.gray_100,
+    borderWidth: 1,
+    borderRadius: 8,
+    height: 44,
+    paddingHorizontal: 10,
+    justifyContent: 'center',
+    backgroundColor: Colors.menuWhite,
   },
   button: {
     flex: 0.2,
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 17934c7..d4841a6 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -5,8 +5,8 @@ import PoppinsText from '../components/PoppinsText';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 import Button from '../components/Button';
+import { OrderResponse } from '@pharmatech/sdk'; // Usar el tipo del SDK
 import { UserService } from '../services/user';
-import { OrderResponse } from '../types/api';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -67,9 +67,6 @@ const OrdersScreen = () => {
           Mis Pedidos
         </PoppinsText>
       </View>
-      <TouchableOpacity onPress={() => router.push(`order`)}>
-        <PoppinsText>Ver detalle de orden</PoppinsText>
-      </TouchableOpacity>
       <View style={styles.orderInfo}>
         {ordersList &&
           ordersList.length > 0 &&
@@ -97,10 +94,11 @@ const OrdersScreen = () => {
                   <View>
                     <PoppinsText>{order.id}</PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
-                      {order.createdAt}
+                      {new Date(order.createdAt).toLocaleDateString()}{' '}
+                      {/* Formatear fecha */}
                     </PoppinsText>
                   </View>
-                  <PoppinsText>${order.totalPrice}</PoppinsText>
+                  <PoppinsText>${order.totalPrice.toFixed(2)}</PoppinsText>
                 </View>
                 <View
                   style={{
@@ -123,26 +121,18 @@ const OrdersScreen = () => {
                   >
                     {order.status}
                   </PoppinsText>
-                  <View
-                    style={{
-                      flexDirection: 'row',
-                      justifyContent: 'space-between',
-                      alignItems: 'center',
-                    }}
+                  <TouchableOpacity
+                    onPress={() => router.push(`order/${order.id}`)}
                   >
-                    <TouchableOpacity
-                      onPress={() => router.push(`order/${order.id}`)}
-                    >
-                      <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
-                        Ver detalles
-                      </PoppinsText>
-                    </TouchableOpacity>
-                    <Button
-                      title="Re ordenar"
-                      size="small"
-                      style={{ marginLeft: 20, paddingVertical: 0 }}
-                    />
-                  </View>
+                    <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
+                      Ver detalles
+                    </PoppinsText>
+                  </TouchableOpacity>
+                  <Button
+                    title="Re ordenar"
+                    size="small"
+                    style={{ paddingVertical: 0 }}
+                  />
                 </View>
               </View>
             </View>
@@ -172,50 +162,9 @@ const styles = StyleSheet.create({
     marginTop: 30,
     marginBottom: 15,
   },
-  orderImage: {
-    width: 120,
-    height: 120,
-    borderRadius: 60,
-    marginBottom: 15,
-    borderWidth: 2,
-    borderColor: '#e0e0e0',
-  },
-  editButton: {
-    paddingVertical: 10,
-    paddingHorizontal: 20,
-    borderRadius: 20,
-  },
-  editButtonText: {
-    color: Colors.primary,
-  },
   orderInfo: {
     marginVertical: 5,
   },
-  fieldContainer: {
-    marginBottom: 15,
-  },
-  fieldLabel: {
-    fontSize: 14,
-    color: '#666',
-    marginBottom: 5,
-  },
-  fieldValue: {
-    fontSize: 18,
-    color: '#333',
-    marginBottom: 10,
-  },
-  separator: {
-    height: 1,
-    backgroundColor: '#e0e0e0',
-    marginBottom: 15,
-  },
-  bottomEditButton: {
-    alignSelf: 'center',
-    marginTop: 20,
-    marginBottom: 40,
-    width: '50%',
-    alignItems: 'center',
-  },
 });
 
 export default OrdersScreen;
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 2dc0234..e9f8326 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -54,13 +54,19 @@ const ProductDetailScreen: React.FC = () => {
   const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
   const [currentPrice, setCurrentPrice] = useState<number>(0);
+  const [currentPresentationDescription, setCurrentPresentationDescription] =
+    useState<string | null>(null);
   const imagesScrollRef = useRef<ScrollView>(null);
 
   const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
     useCart();
 
   const getQuantity = (): number => {
-    return product?.id ? getItemQuantity(product.id) : 0;
+    const selectedPresentationId = product?.presentation.find(
+      (p) => p.description === currentPresentationDescription,
+    )?.id;
+
+    return selectedPresentationId ? getItemQuantity(selectedPresentationId) : 0;
   };
 
   const obtainProducts = async () => {
@@ -69,7 +75,8 @@ const ProductDetailScreen: React.FC = () => {
     if (productsData.success) {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
-        id: p.product.id,
+        id: p.id,
+        productId: p.product.id, // productId
         imageUrl: p.product.images[0].url,
         name: p.product.name,
         category: p.product.categories[0].name,
@@ -79,13 +86,13 @@ const ProductDetailScreen: React.FC = () => {
         quantity: getItemQuantity(p.product.id),
         getQuantity: (quantity: number) => {
           addToCart({
-            id: p.product.id,
+            id: p.id,
             name: p.product.name,
             price: p.price,
             quantity,
             image: p.product.images[0].url,
           });
-          updateCartQuantity(p.product.id, quantity);
+          updateCartQuantity(p.id, quantity);
         },
       }));
 
@@ -96,11 +103,14 @@ const ProductDetailScreen: React.FC = () => {
   };
 
   const changePresentation = (description: string) => {
+    setCurrentPresentationDescription(description);
     const presentation = product?.presentation.find(
       (p) => p.description === description,
     );
-    if (presentation && 'price' in presentation)
+
+    if (presentation) {
       setCurrentPrice(presentation.price);
+    }
   };
 
   useEffect(() => {
@@ -479,7 +489,13 @@ const ProductDetailScreen: React.FC = () => {
           <CardButton
             size={10}
             getValue={(quantity) => {
-              if (product?.id) updateCartQuantity(product.id, quantity);
+              const selectedPresentationId = product?.presentation.find(
+                (p) => p.description === currentPresentationDescription,
+              )?.id;
+
+              if (selectedPresentationId) {
+                updateCartQuantity(selectedPresentationId, quantity);
+              }
             }}
             initialValue={getQuantity()}
           />
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 717537f..4727e37 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -31,7 +31,8 @@ export default function HomeScreen() {
     if (productsData.success) {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
-        id: p.product.id,
+        id: p.id, // productPresentationId
+        productId: p.product.id, // productId
         imageUrl:
           p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
         name: p.product.name,
@@ -39,17 +40,17 @@ export default function HomeScreen() {
         originalPrice: p.price,
         discount: 10,
         finalPrice: p.price - p.price * 0.1,
-        quantity: getItemQuantity(p.product.id),
+        quantity: getItemQuantity(p.id),
         getQuantity: (quantity: number) => {
           addToCart({
-            id: p.product.id,
+            id: p.id, // productPresentationId
             name: p.product.name,
             price: p.price,
             quantity,
             image:
               p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
           });
-          updateCartQuantity(p.product.id, quantity);
+          updateCartQuantity(p.id, quantity);
         },
       }));
 
diff --git a/src/types/Product.ts b/src/types/Product.ts
index 8da8dd1..4818098 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -1,5 +1,6 @@
 export type Product = {
   id: string;
+  productId: string; // productId
   imageUrl: string;
   name: string;
   category: string;

From 4c39c38fcfd5cf867258428d36861de7073ea652 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Mon, 21 Apr 2025 12:41:57 -0400
Subject: [PATCH 132/291] Added search products screen and updated searchInput
 component

---
 src/app/products/[search].tsx       |   2 +
 src/components/SearchInput.tsx      | 100 +++--
 src/screens/SearchProductScreen.tsx | 610 ++++++++++++++++++++++++++++
 3 files changed, 684 insertions(+), 28 deletions(-)
 create mode 100644 src/app/products/[search].tsx
 create mode 100644 src/screens/SearchProductScreen.tsx

diff --git a/src/app/products/[search].tsx b/src/app/products/[search].tsx
new file mode 100644
index 0000000..8864333
--- /dev/null
+++ b/src/app/products/[search].tsx
@@ -0,0 +1,2 @@
+import SearchProductScreen from '../../screens/SearchProductScreen';
+export default SearchProductScreen;
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index 4da163b..f4ae48d 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -1,7 +1,12 @@
-import React from 'react';
+import React, { useState } from 'react';
 import { View, TextInput, StyleSheet, TouchableOpacity } from 'react-native';
-import { MagnifyingGlassIcon, XMarkIcon } from 'react-native-heroicons/outline';
+import {
+  ArrowRightIcon,
+  MagnifyingGlassIcon,
+  XMarkIcon,
+} from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
 
 interface SearchInputProps {
   placeholder?: string;
@@ -20,37 +25,76 @@ const SearchInput: React.FC<SearchInputProps> = ({
   style,
   showClearButton = true,
 }) => {
+  const [search, setSearch] = useState('');
   return (
-    <View style={[styles.container, style]}>
-      <TouchableOpacity
-        onPress={onSearchPress}
-        style={styles.iconContainer}
-        testID="search-icon"
-      >
-        <MagnifyingGlassIcon size={20} color={Colors.textLowContrast} />
-      </TouchableOpacity>
-
-      <TextInput
-        style={styles.input}
-        placeholder={placeholder}
-        placeholderTextColor={Colors.textLowContrast}
-        value={value}
-        onChangeText={onChangeText}
-        returnKeyType="search"
-        onSubmitEditing={onSearchPress}
-      />
-
-      {showClearButton && value.length > 0 && (
+    <>
+      <View style={[styles.container, style]}>
         <TouchableOpacity
-          onPress={() => onChangeText('')}
-          style={styles.clearButton}
-          testID="clear-button"
-          accessibilityLabel="Limpiar búsqueda"
+          onPress={onSearchPress}
+          style={styles.iconContainer}
+          testID="search-icon"
         >
-          <XMarkIcon size={20} color={Colors.textLowContrast} />
+          <MagnifyingGlassIcon size={20} color={Colors.textLowContrast} />
         </TouchableOpacity>
+
+        <TextInput
+          style={styles.input}
+          placeholder={placeholder}
+          placeholderTextColor={Colors.textLowContrast}
+          value={search}
+          onChangeText={(value) => setSearch(value)}
+          returnKeyType="search"
+          onSubmitEditing={onSearchPress}
+        />
+
+        {showClearButton && value.length > 0 && (
+          <TouchableOpacity
+            onPress={() => onChangeText('')}
+            style={styles.clearButton}
+            testID="clear-button"
+            accessibilityLabel="Limpiar búsqueda"
+          >
+            <XMarkIcon size={20} color={Colors.textLowContrast} />
+          </TouchableOpacity>
+        )}
+      </View>
+      {search && (
+        <View
+          style={{
+            zIndex: 999,
+            position: 'absolute',
+            top: 110,
+            left: 20,
+            width: 325,
+          }}
+        >
+          <View
+            style={{
+              backgroundColor: Colors.textWhite,
+              padding: 10,
+              borderRadius: 5,
+              flex: 1,
+            }}
+          >
+            <View style={{ flexDirection: 'row' }}>
+              <PoppinsText>Sugerencias</PoppinsText>
+              <PoppinsText style={{ flex: 1, flexWrap: 'wrap' }}>
+                Productos que coinciden con &quot;{search}&quot;
+              </PoppinsText>
+            </View>
+            <View></View>
+            <View
+              style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+            >
+              <PoppinsText style={{ flex: 1, flexWrap: 'wrap' }}>
+                Buscar &quot;{search}&quot;
+              </PoppinsText>
+              <ArrowRightIcon size={20} color={Colors.gray_500} />
+            </View>
+          </View>
+        </View>
       )}
-    </View>
+    </>
   );
 };
 
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
new file mode 100644
index 0000000..6f1d0b0
--- /dev/null
+++ b/src/screens/SearchProductScreen.tsx
@@ -0,0 +1,610 @@
+import React, { useState, useRef, useEffect } from 'react';
+import {
+  View,
+  Image,
+  ScrollView,
+  StyleSheet,
+  TouchableOpacity,
+  SafeAreaView,
+  Dimensions,
+  NativeSyntheticEvent,
+  NativeScrollEvent,
+} from 'react-native';
+import { useLocalSearchParams } from 'expo-router';
+import TopBar from '../components/TopBar';
+import { useCart } from '../hooks/useCart';
+import { Product as CardProduct } from '../types/Product';
+import {
+  CheckCircleIcon,
+  StarIcon,
+  ChevronLeftIcon,
+} from 'react-native-heroicons/solid';
+import { Colors, FontSizes } from '../styles/theme';
+import Dropdown from '../components/Dropdown';
+import CardButton from '../components/CardButton';
+import PoppinsText from '../components/PoppinsText';
+import { ProductService } from '../services/products';
+import {
+  AdjustmentsHorizontalIcon,
+  TruckIcon,
+} from 'react-native-heroicons/outline';
+import Carousel from '../components/Carousel';
+import { StateService } from '../services/state';
+import { Inventory, State } from '../types/api';
+import { InventoryService } from '../services/inventory';
+import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
+import BranchMap from '../components/BranchMap';
+
+type Product = {
+  id: string;
+  name: string;
+  description: string | undefined;
+  rating: number;
+  discount: number;
+  presentation: { id: string; description: string; price: number }[];
+  images: string[];
+};
+
+export default function SearchProductScreen() {
+  const { id } = useLocalSearchParams<{ id: string }>();
+  const navigation = useNavigation(); // Obtén la instancia de navegación
+
+  const [inventory, setInventory] = useState<Inventory[]>([]);
+  const [states, setStates] = useState<State[]>([]);
+  const [product, setProduct] = useState<Product>();
+  const [products, setProducts] = useState<CardProduct[]>([]);
+  const [userRating, setUserRating] = useState<number>(0);
+  const [hoverRating, setHoverRating] = useState<number>(0);
+  const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
+  const [currentPrice, setCurrentPrice] = useState<number>(0);
+  const imagesScrollRef = useRef<ScrollView>(null);
+
+  const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
+    useCart();
+
+  const getQuantity = (): number => {
+    return product?.id ? getItemQuantity(product.id) : 0;
+  };
+
+  const obtainProducts = async () => {
+    const productsData = await ProductService.getProducts(1, 20);
+
+    if (productsData.success) {
+      const pd = productsData.data.results;
+      const carouselProducts = pd.map((p) => ({
+        id: p.product.id,
+        imageUrl: p.product.images[0].url,
+        name: p.product.name,
+        category: p.product.categories[0].name,
+        originalPrice: p.price,
+        discount: 10,
+        finalPrice: p.price - p.price * 0.1,
+        quantity: getItemQuantity(p.product.id),
+        getQuantity: (quantity: number) => {
+          addToCart({
+            id: p.product.id,
+            name: p.product.name,
+            price: p.price,
+            quantity,
+            image: p.product.images[0].url,
+          });
+          updateCartQuantity(p.product.id, quantity);
+        },
+      }));
+
+      setProducts(carouselProducts);
+    } else {
+      console.log(productsData.error);
+    }
+  };
+
+  const changePresentation = (description: string) => {
+    const presentation = product?.presentation.find(
+      (p) => p.description === description,
+    );
+    if (presentation && 'price' in presentation)
+      setCurrentPrice(presentation.price);
+  };
+
+  useEffect(() => {
+    obtainProducts();
+  }, [cartItems]);
+
+  useEffect(() => {
+    const obtainProducts = async () => {
+      const productsData = await ProductService.getGenericProduct(id);
+      const productsPresentation =
+        await ProductService.getProductPresentations(id);
+      const productsImage = await ProductService.getProductImages(id);
+
+      const states = await StateService.getStates(1, 40);
+
+      if (states.success) {
+        setStates(states.data.results);
+      }
+
+      if (productsData.success) {
+        setProduct({
+          id: productsData.data.id,
+          name: productsData.data.name,
+          description: productsPresentation.success
+            ? productsData.data.description
+            : undefined,
+          rating: 0,
+          images: productsImage.success
+            ? productsImage.data.map((image: { url: string }) => image.url)
+            : [],
+          discount: 10,
+          presentation: productsPresentation.success
+            ? productsPresentation.data.map(
+                (presentation: {
+                  id: string;
+                  presentation: { description: string };
+                  price: number;
+                }) => ({
+                  id: presentation.id,
+                  description: presentation.presentation.description,
+                  price: presentation.price,
+                }),
+              )
+            : [],
+        });
+
+        setCurrentPrice(
+          productsPresentation.success ? productsPresentation.data[0].price : 0,
+        );
+      }
+    };
+
+    obtainProducts();
+  }, []);
+
+  useEffect(() => {
+    const fetchInventory = async () => {
+      if (product?.presentation) {
+        for (const p of product.presentation) {
+          const inventoryData = await InventoryService.getPresentationInventory(
+            1,
+            20,
+            p.id || '',
+          );
+          if (inventoryData.success) {
+            const newInventory = inventoryData.data.results.map((inv) => ({
+              id: inv.id,
+              branch: {
+                id: inv.branch.id,
+                name: inv.branch.name,
+                address: inv.branch.address,
+                latitude: inv.branch.latitude,
+                longitude: inv.branch.longitude,
+              },
+              stockQuantity: inv.stockQuantity, // Mover al nivel superior
+            }));
+
+            setInventory((prevInventory) => {
+              const updatedInventory = [...prevInventory];
+              newInventory.forEach((newItem) => {
+                if (!prevInventory.some((item) => item.id === newItem.id)) {
+                  updatedInventory.push(newItem as Inventory);
+                }
+              });
+              return updatedInventory;
+            });
+          } else {
+            console.error(inventoryData.error);
+          }
+        }
+      }
+    };
+    fetchInventory();
+  }, [product]);
+
+  const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
+    const contentOffsetX = event.nativeEvent.contentOffset.x;
+    const newIndex = Math.round(contentOffsetX / width);
+    setCurrentImageIndex(newIndex);
+  };
+
+  const scrollToImage = (index: number) => {
+    setCurrentImageIndex(index);
+    if (imagesScrollRef.current) {
+      imagesScrollRef.current.scrollTo({
+        x: index * width,
+        animated: true,
+      });
+    }
+  };
+
+  const handleRating = (rating: number) => {
+    setUserRating(rating);
+    // Aquí podrías enviar la calificación a tu API
+    console.log('Calificación enviada:', rating);
+  };
+
+  const RatingStars = () => {
+    return (
+      <View style={styles.ratingStarsContainer}>
+        {[1, 2, 3, 4, 5].map((star) => (
+          <TouchableOpacity
+            key={star}
+            activeOpacity={0.7}
+            onPress={() => handleRating(star)}
+            onPressIn={() => setHoverRating(star)}
+            onPressOut={() => setHoverRating(0)}
+          >
+            <StarIcon
+              size={32}
+              color={
+                star <= (hoverRating || userRating)
+                  ? Colors.semanticWarning
+                  : Colors.gray_100
+              }
+              style={styles.starIcon}
+            />
+          </TouchableOpacity>
+        ))}
+      </View>
+    );
+  };
+
+  console.log('Current inventory state:', inventory); // Log para inspeccionar el estado de inventory
+
+  return (
+    <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+      <TopBar />
+      <TouchableOpacity>
+        <PoppinsText>Filtrar</PoppinsText>
+        <AdjustmentsHorizontalIcon />
+      </TouchableOpacity>
+      {/* Botón de volver */}
+      <TouchableOpacity
+        onPress={() => navigation.goBack()} // Navega a la pantalla anterior
+        style={{
+          paddingHorizontal: 10,
+          marginBottom: -4,
+          flexDirection: 'row',
+          alignItems: 'center',
+        }}
+      >
+        <ChevronLeftIcon
+          width={16}
+          height={16}
+          color={Colors.primary}
+          style={{ marginRight: 2, marginLeft: 6 }} // Espacio entre el ícono y el texto
+        />
+        <PoppinsText
+          weight="medium"
+          style={{
+            fontSize: FontSizes.b1.size,
+            lineHeight: FontSizes.b1.lineHeight,
+            color: Colors.primary,
+          }}
+        >
+          Volver
+        </PoppinsText>
+      </TouchableOpacity>
+      <SafeAreaView style={styles.container}>
+        <ScrollView>
+          {/* Carrusel de imágenes */}
+          <ScrollView
+            ref={imagesScrollRef}
+            horizontal
+            pagingEnabled
+            showsHorizontalScrollIndicator={false}
+            onMomentumScrollEnd={handleScroll}
+          >
+            {product?.images.map((image, index) => (
+              <Image
+                key={index}
+                source={{ uri: image }}
+                style={styles.productImage}
+                resizeMode="contain"
+              />
+            ))}
+          </ScrollView>
+
+          {/* Indicadores de imágenes */}
+          <View style={styles.imageIndicators}>
+            {product?.images.map((_, index) => (
+              <TouchableOpacity
+                key={index}
+                onPress={() => scrollToImage(index)}
+              >
+                <View
+                  style={[
+                    styles.imageIndicator,
+                    index === currentImageIndex && styles.activeImageIndicator,
+                  ]}
+                />
+              </TouchableOpacity>
+            ))}
+          </View>
+
+          <PoppinsText style={styles.productName}>{product?.name}</PoppinsText>
+
+          <RatingStars />
+          {userRating > 0 && (
+            <PoppinsText style={styles.ratingFeedback}>
+              ¡Gracias por tu calificación de {userRating} estrella
+              {userRating !== 1 ? 's' : ''}!
+            </PoppinsText>
+          )}
+
+          <PoppinsText style={styles.description}>
+            {product?.description}
+          </PoppinsText>
+
+          {/* Información del producto */}
+          <View style={styles.productInfo}>
+            <View style={styles.priceRatingContainer}>
+              <PoppinsText style={styles.price}>$ {currentPrice}</PoppinsText>
+              {product?.discount && (
+                <PoppinsText style={styles.discount}>
+                  -{product.discount}%
+                </PoppinsText>
+              )}
+            </View>
+            <PoppinsText style={styles.sectionTitle}>
+              Selecciona la presentación
+            </PoppinsText>
+            <View style={styles.quantitySelector}>
+              <Dropdown
+                placeholder="Presentación..."
+                options={
+                  product?.presentation.map(
+                    (p: { description: string }) => p.description,
+                  ) || []
+                }
+                borderColor={Colors.gray_100}
+                onSelect={(e) => changePresentation(e)}
+              />
+            </View>
+            <PoppinsText
+              style={[
+                styles.sectionTitle,
+                { fontSize: FontSizes.s1.size, paddingTop: 15 },
+              ]}
+            >
+              Disponibilidad en sucursales
+            </PoppinsText>
+            <View style={styles.quantitySelector}>
+              <View style={{ flex: 1, height: 300 }}>
+                {inventory && inventory.length > 0 ? (
+                  <BranchMap
+                    branches={inventory.map((inv) => ({
+                      id: inv.branch.id,
+                      name: inv.branch.name,
+                      address: inv.branch.address,
+                      latitude: inv.branch.latitude,
+                      longitude: inv.branch.longitude,
+                      stockQuantity: inv.stockQuantity,
+                    }))}
+                  />
+                ) : (
+                  <PoppinsText
+                    style={{
+                      textAlign: 'center',
+                      color: Colors.textLowContrast,
+                      marginVertical: 10,
+                    }}
+                  >
+                    No hay productos disponibles
+                  </PoppinsText>
+                )}
+              </View>
+            </View>
+            <PoppinsText style={styles.sectionTitle}>
+              Selecciona el estado
+            </PoppinsText>
+            <View style={styles.quantitySelector}>
+              <Dropdown
+                placeholder="Estado..."
+                options={states.map((state) => state.name)}
+                borderColor={Colors.gray_100}
+                onSelect={() => console.log('p')}
+              />
+            </View>
+            <View style={styles.availableContainer}>
+              {inventory && inventory.length > 0 ? (
+                inventory.map((inv) => (
+                  <View key={inv.id} style={styles.availableCard}>
+                    <View style={{ padding: 10, paddingHorizontal: 16 }}>
+                      <PoppinsText style={styles.sectionTitle}>
+                        {inv.branch.name}
+                      </PoppinsText>
+                      <PoppinsText
+                        style={{
+                          fontSize: FontSizes.b3.size,
+                          color: Colors.textLowContrast,
+                        }}
+                      >
+                        {inv.branch.address}
+                      </PoppinsText>
+                    </View>
+                    <View
+                      style={{
+                        width: '100%',
+                        alignItems: 'flex-end',
+                        paddingHorizontal: 20,
+                      }}
+                    >
+                      <View
+                        style={{ flexDirection: 'row', alignItems: 'center' }}
+                      >
+                        <PoppinsText
+                          style={{
+                            fontSize: FontSizes.c1.size,
+                            color: Colors.textLowContrast,
+                          }}
+                        >
+                          {inv.stockQuantity} unidades{' '}
+                        </PoppinsText>
+                        <CheckCircleIcon
+                          size={15}
+                          color={Colors.semanticSuccess}
+                        />
+                      </View>
+                      <View
+                        style={{ flexDirection: 'row', alignItems: 'center' }}
+                      >
+                        <TruckIcon size={15} color={Colors.gray_500} />
+                        <PoppinsText
+                          style={{
+                            fontSize: FontSizes.c3.size,
+                            color: Colors.gray_500,
+                            marginLeft: 5,
+                          }}
+                        >
+                          Envio en menos de 3h
+                        </PoppinsText>
+                      </View>
+                    </View>
+                  </View>
+                ))
+              ) : (
+                <PoppinsText
+                  style={{
+                    textAlign: 'center',
+                    color: Colors.textLowContrast,
+                    marginVertical: 10,
+                  }}
+                >
+                  No hay productos disponibles
+                </PoppinsText>
+              )}
+            </View>
+            <PoppinsText style={styles.sectionTitle}>
+              Productos relacionados
+            </PoppinsText>
+            <View style={styles.quantitySelector}>
+              <Carousel cards={products} />
+            </View>
+          </View>
+        </ScrollView>
+
+        <View style={styles.cardButtonContainer}>
+          <CardButton
+            size={10}
+            getValue={(quantity) => {
+              if (product?.id) updateCartQuantity(product.id, quantity);
+            }}
+            initialValue={getQuantity()}
+          />
+        </View>
+      </SafeAreaView>
+    </View>
+  );
+}
+
+const { width } = Dimensions.get('window');
+
+const styles = StyleSheet.create({
+  container: {
+    paddingTop: 15,
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  productImage: {
+    width: width,
+    height: 200,
+  },
+  imageIndicators: {
+    flexDirection: 'row',
+    justifyContent: 'center',
+    marginVertical: 8,
+  },
+  imageIndicator: {
+    width: 8,
+    height: 8,
+    borderRadius: 4,
+    backgroundColor: '#CCCCCC',
+    marginHorizontal: 4,
+  },
+  activeImageIndicator: {
+    backgroundColor: Colors.gray_500,
+    width: 17,
+  },
+  productInfo: {
+    padding: 16,
+    paddingVertical: 0,
+  },
+  priceRatingContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  price: {
+    fontSize: 24,
+    fontWeight: 'bold',
+    color: Colors.primary,
+    marginRight: 10,
+  },
+  productName: {
+    textAlign: 'center',
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    marginVertical: 15,
+  },
+  description: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+    marginHorizontal: 20,
+    marginBottom: 20,
+    lineHeight: 20,
+  },
+  sectionTitle: {
+    fontSize: FontSizes.s2.size,
+    color: Colors.textLowContrast,
+    marginBottom: 3,
+  },
+  quantitySelector: {
+    flexDirection: 'row',
+    marginBottom: 15,
+  },
+  ratingStarsContainer: {
+    flexDirection: 'row',
+    marginBottom: 20,
+    justifyContent: 'center',
+  },
+  starIcon: {
+    marginHorizontal: 4,
+  },
+  ratingFeedback: {
+    textAlign: 'center',
+    color: '#4CAF50',
+    marginBottom: 20,
+    fontStyle: 'italic',
+  },
+  mapContainer: {
+    marginVertical: 8,
+    flex: 1,
+    alignItems: 'center',
+  },
+  availableContainer: {
+    marginBottom: 8,
+    backgroundColor: Colors.textWhite,
+    borderRadius: 15,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+  },
+  availableCard: {
+    marginBottom: 10,
+    justifyContent: 'space-between',
+    borderBottomWidth: 1,
+    borderColor: Colors.gray_100,
+  },
+  cardButtonContainer: {
+    position: 'relative',
+    top: -40,
+    left: 120,
+    maxWidth: '65%',
+    alignItems: 'flex-end',
+    zIndex: 999,
+  },
+  discount: {
+    fontSize: FontSizes.b4.size,
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 5,
+    padding: 4,
+  },
+});

From 0d811ee0285ab267edb5e0ac050d8303c703a4a0 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Mon, 21 Apr 2025 16:13:17 -0400
Subject: [PATCH 133/291] Using product id and presentation id for home screen
 products and product detail screen

---
 src/app/_layout.tsx                           |  5 ++-
 src/app/products/[id].tsx                     |  2 --
 .../[productId]/presentation/[id].tsx         |  2 ++
 .../[productId]/presentation/_layout.tsx      | 12 +++++++
 src/components/Card.tsx                       | 13 +++++--
 src/screens/ProductDetailScreen.tsx           | 36 ++++++++++++++-----
 src/screens/tab/HomeScreen.tsx                | 27 ++++++++++----
 src/services/products.ts                      | 22 +++++++++++-
 src/types/Product.ts                          |  1 +
 9 files changed, 98 insertions(+), 22 deletions(-)
 delete mode 100644 src/app/products/[id].tsx
 create mode 100644 src/app/products/[productId]/presentation/[id].tsx
 create mode 100644 src/app/products/[productId]/presentation/_layout.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 3253525..97d2ba2 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -68,7 +68,10 @@ export default function RootLayout() {
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="products" options={{ headerShown: false }} />
+        <Stack.Screen
+          name="products/[productId]/presentation"
+          options={{ headerShown: false }}
+        />
         <Stack.Screen
           name="profile"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/products/[id].tsx b/src/app/products/[id].tsx
deleted file mode 100644
index bdf1230..0000000
--- a/src/app/products/[id].tsx
+++ /dev/null
@@ -1,2 +0,0 @@
-import ProductDetailScreen from '../../screens/ProductDetailScreen';
-export default ProductDetailScreen;
diff --git a/src/app/products/[productId]/presentation/[id].tsx b/src/app/products/[productId]/presentation/[id].tsx
new file mode 100644
index 0000000..9e295fd
--- /dev/null
+++ b/src/app/products/[productId]/presentation/[id].tsx
@@ -0,0 +1,2 @@
+import ProductDetailScreen from '../../../../screens/ProductDetailScreen';
+export default ProductDetailScreen;
diff --git a/src/app/products/[productId]/presentation/_layout.tsx b/src/app/products/[productId]/presentation/_layout.tsx
new file mode 100644
index 0000000..1bbfe4d
--- /dev/null
+++ b/src/app/products/[productId]/presentation/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function PresentationLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 760b127..31d1df5 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -10,6 +10,7 @@ import { useRouter } from 'expo-router';
 
 const ProductCard: React.FC<Product> = ({
   id,
+  productId,
   imageUrl,
   name,
   category,
@@ -21,7 +22,11 @@ const ProductCard: React.FC<Product> = ({
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
   return (
-    <TouchableOpacity onPress={() => router.push('/products/' + id)}>
+    <TouchableOpacity
+      onPress={() =>
+        router.push('/products/' + productId + '/presentation/' + id)
+      }
+    >
       <View style={styles.card}>
         <View
           style={{
@@ -92,8 +97,8 @@ const styles = StyleSheet.create({
     marginBottom: 16,
     maxWidth: 140,
     minWidth: 140,
-    minHeight: 270,
-    maxHeight: 300,
+    minHeight: 315,
+    maxHeight: 315,
   },
   tag: {
     backgroundColor: Colors.semanticInfo,
@@ -125,6 +130,8 @@ const styles = StyleSheet.create({
   name: {
     fontSize: FontSizes.s2.size,
     marginBottom: 6,
+    minHeight: 70,
+    maxHeight: 70,
   },
   priceContainer: {
     flexDirection: 'row',
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 2dc0234..3d34eb6 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -43,7 +43,10 @@ type Product = {
 };
 
 const ProductDetailScreen: React.FC = () => {
-  const { id } = useLocalSearchParams<{ id: string }>();
+  const { productId } = useLocalSearchParams<{
+    id: string;
+    productId: string;
+  }>();
   const navigation = useNavigation(); // Obtén la instancia de navegación
 
   const [inventory, setInventory] = useState<Inventory[]>([]);
@@ -69,9 +72,17 @@ const ProductDetailScreen: React.FC = () => {
     if (productsData.success) {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
-        id: p.product.id,
+        id: p.id,
+        productId: p.product.id,
         imageUrl: p.product.images[0].url,
-        name: p.product.name,
+        name:
+          p.product.name +
+          ' ' +
+          p.presentation.name +
+          ' ' +
+          p.presentation.quantity +
+          ' ' +
+          p.presentation.measurementUnit,
         category: p.product.categories[0].name,
         originalPrice: p.price,
         discount: 10,
@@ -79,13 +90,20 @@ const ProductDetailScreen: React.FC = () => {
         quantity: getItemQuantity(p.product.id),
         getQuantity: (quantity: number) => {
           addToCart({
-            id: p.product.id,
-            name: p.product.name,
+            id: p.id,
+            name:
+              p.product.name +
+              ' ' +
+              p.presentation.name +
+              ' ' +
+              p.presentation.quantity +
+              ' ' +
+              p.presentation.measurementUnit,
             price: p.price,
             quantity,
             image: p.product.images[0].url,
           });
-          updateCartQuantity(p.product.id, quantity);
+          updateCartQuantity(p.id, quantity);
         },
       }));
 
@@ -109,10 +127,10 @@ const ProductDetailScreen: React.FC = () => {
 
   useEffect(() => {
     const obtainProducts = async () => {
-      const productsData = await ProductService.getGenericProduct(id);
+      const productsData = await ProductService.getGenericProduct(productId);
       const productsPresentation =
-        await ProductService.getProductPresentations(id);
-      const productsImage = await ProductService.getProductImages(id);
+        await ProductService.getProductPresentations(productId);
+      const productsImage = await ProductService.getProductImages(productId);
 
       const states = await StateService.getStates(1, 40);
 
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index cb71a75..aa9b442 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -31,23 +31,38 @@ export default function HomeScreen() {
     if (productsData.success) {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
-        id: p.product.id,
+        id: p.id,
+        productId: p.product.id,
         imageUrl: p.product.images[0].url,
-        name: p.product.name,
+        name:
+          p.product.name +
+          ' ' +
+          p.presentation.name +
+          ' ' +
+          p.presentation.quantity +
+          ' ' +
+          p.presentation.measurementUnit,
         category: p.product.categories[0].name,
         originalPrice: p.price,
         discount: 10,
         finalPrice: p.price - p.price * 0.1,
-        quantity: getItemQuantity(p.product.id),
+        quantity: getItemQuantity(p.id),
         getQuantity: (quantity: number) => {
           addToCart({
-            id: p.product.id,
-            name: p.product.name,
+            id: p.id,
+            name:
+              p.product.name +
+              ' ' +
+              p.presentation.name +
+              ' ' +
+              p.presentation.quantity +
+              ' ' +
+              p.presentation.measurementUnit,
             price: p.price,
             quantity,
             image: p.product.images[0].url,
           });
-          updateCartQuantity(p.product.id, quantity);
+          updateCartQuantity(p.id, quantity);
         },
       }));
 
diff --git a/src/services/products.ts b/src/services/products.ts
index d10f82a..27ddb63 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -5,6 +5,7 @@ import {
   GenericProductResponse,
   ProductPresentationResponse,
   ProductImage,
+  ProductPresentationDetailResponse,
 } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
 import { extractErrorMessage } from '../utils/errorHandler';
@@ -29,12 +30,31 @@ export const ProductService = {
     }
   },
 
+  getPresentation: async (
+    productId: string,
+    presentationId: string,
+  ): Promise<ServiceResponse<ProductPresentationDetailResponse>> => {
+    try {
+      const presentation = await api.productPresentation.getByPresentationId(
+        productId,
+        presentationId,
+      );
+
+      return { success: true, data: presentation };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
+
   getGenericProduct: async (
     id: string,
   ): Promise<ServiceResponse<GenericProductResponse>> => {
     try {
       const product = await api.genericProduct.getById(id);
-
+      console.log(product);
       return { success: true, data: product };
     } catch (error) {
       return {
diff --git a/src/types/Product.ts b/src/types/Product.ts
index 8da8dd1..2d5bb69 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -1,5 +1,6 @@
 export type Product = {
   id: string;
+  productId: string;
   imageUrl: string;
   name: string;
   category: string;

From bf8cc264359180f6a8c5580087ac317118ce0c91 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Mon, 21 Apr 2025 18:50:58 -0400
Subject: [PATCH 134/291] Updated product detail to use sdk types

---
 src/app/products/[productId]/_layout.tsx |  12 ++
 src/components/Card.tsx                  |   5 +-
 src/screens/ProductDetailScreen.tsx      | 145 +++++++++++------------
 src/screens/tab/HomeScreen.tsx           |   1 +
 src/types/Product.ts                     |   1 +
 5 files changed, 89 insertions(+), 75 deletions(-)
 create mode 100644 src/app/products/[productId]/_layout.tsx

diff --git a/src/app/products/[productId]/_layout.tsx b/src/app/products/[productId]/_layout.tsx
new file mode 100644
index 0000000..c87c606
--- /dev/null
+++ b/src/app/products/[productId]/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function ProductIdLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 31d1df5..0406293 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -10,6 +10,7 @@ import { useRouter } from 'expo-router';
 
 const ProductCard: React.FC<Product> = ({
   id,
+  presentationId,
   productId,
   imageUrl,
   name,
@@ -24,7 +25,9 @@ const ProductCard: React.FC<Product> = ({
   return (
     <TouchableOpacity
       onPress={() =>
-        router.push('/products/' + productId + '/presentation/' + id)
+        router.push(
+          '/products/' + productId + '/presentation/' + presentationId,
+        )
       }
     >
       <View style={styles.card}>
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 3d34eb6..9ad5955 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -10,7 +10,7 @@ import {
   NativeSyntheticEvent,
   NativeScrollEvent,
 } from 'react-native';
-import { useLocalSearchParams } from 'expo-router';
+import { useRouter, useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
 import { useCart } from '../hooks/useCart';
 import { Product as CardProduct } from '../types/Product';
@@ -31,19 +31,14 @@ import { Inventory, State } from '../types/api';
 import { InventoryService } from '../services/inventory';
 import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
 import BranchMap from '../components/BranchMap';
-
-type Product = {
-  id: string;
-  name: string;
-  description: string | undefined;
-  rating: number;
-  discount: number;
-  presentation: { id: string; description: string; price: number }[];
-  images: string[];
-};
+import {
+  ProductImage,
+  ProductPresentationDetailResponse,
+  ProductPresentationResponse,
+} from '@pharmatech/sdk';
 
 const ProductDetailScreen: React.FC = () => {
-  const { productId } = useLocalSearchParams<{
+  const { id, productId } = useLocalSearchParams<{
     id: string;
     productId: string;
   }>();
@@ -51,13 +46,17 @@ const ProductDetailScreen: React.FC = () => {
 
   const [inventory, setInventory] = useState<Inventory[]>([]);
   const [states, setStates] = useState<State[]>([]);
-  const [product, setProduct] = useState<Product>();
+  const [product, setProduct] = useState<ProductPresentationDetailResponse>();
+  const [images, setImages] = useState<ProductImage[]>();
+  const [presentations, setPresentations] =
+    useState<ProductPresentationResponse[]>();
   const [products, setProducts] = useState<CardProduct[]>([]);
   const [userRating, setUserRating] = useState<number>(0);
   const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
-  const [currentPrice, setCurrentPrice] = useState<number>(0);
   const imagesScrollRef = useRef<ScrollView>(null);
+  const discount = 10;
+  const router = useRouter();
 
   const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
     useCart();
@@ -73,6 +72,7 @@ const ProductDetailScreen: React.FC = () => {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
         id: p.id,
+        presentationId: p.presentation.id,
         productId: p.product.id,
         imageUrl: p.product.images[0].url,
         name:
@@ -113,12 +113,27 @@ const ProductDetailScreen: React.FC = () => {
     }
   };
 
-  const changePresentation = (description: string) => {
-    const presentation = product?.presentation.find(
-      (p) => p.description === description,
+  const changePresentation = async (description: string) => {
+    if (!presentations) return;
+    const presentation = presentations.find(
+      (p) =>
+        product?.product.name +
+          ' ' +
+          p.presentation.name +
+          ' ' +
+          p.presentation.quantity +
+          ' ' +
+          p.presentation.measurementUnit ===
+        description,
     );
-    if (presentation && 'price' in presentation)
-      setCurrentPrice(presentation.price);
+    if (presentation) {
+      router.replace(
+        '/products/' +
+          productId +
+          '/presentation/' +
+          presentation.presentation.id,
+      );
+    }
   };
 
   useEffect(() => {
@@ -126,58 +141,27 @@ const ProductDetailScreen: React.FC = () => {
   }, [cartItems]);
 
   useEffect(() => {
-    const obtainProducts = async () => {
-      const productsData = await ProductService.getGenericProduct(productId);
-      const productsPresentation =
+    const obtainProduct = async () => {
+      const productPresentations =
         await ProductService.getProductPresentations(productId);
-      const productsImage = await ProductService.getProductImages(productId);
-
+      const productImages = await ProductService.getProductImages(productId);
+      const productData = await ProductService.getPresentation(productId, id);
       const states = await StateService.getStates(1, 40);
 
-      if (states.success) {
-        setStates(states.data.results);
-      }
-
-      if (productsData.success) {
-        setProduct({
-          id: productsData.data.id,
-          name: productsData.data.name,
-          description: productsPresentation.success
-            ? productsData.data.description
-            : undefined,
-          rating: 0,
-          images: productsImage.success
-            ? productsImage.data.map((image: { url: string }) => image.url)
-            : [],
-          discount: 10,
-          presentation: productsPresentation.success
-            ? productsPresentation.data.map(
-                (presentation: {
-                  id: string;
-                  presentation: { description: string };
-                  price: number;
-                }) => ({
-                  id: presentation.id,
-                  description: presentation.presentation.description,
-                  price: presentation.price,
-                }),
-              )
-            : [],
-        });
-
-        setCurrentPrice(
-          productsPresentation.success ? productsPresentation.data[0].price : 0,
-        );
-      }
+      if (productData.success) setProduct(productData.data);
+      if (productImages.success) setImages(productImages.data);
+      if (productPresentations.success)
+        setPresentations(productPresentations.data);
+      if (states.success) setStates(states.data.results);
     };
 
-    obtainProducts();
+    obtainProduct();
   }, []);
 
   useEffect(() => {
     const fetchInventory = async () => {
-      if (product?.presentation) {
-        for (const p of product.presentation) {
+      if (presentations) {
+        for (const p of presentations) {
           const inventoryData = await InventoryService.getPresentationInventory(
             1,
             20,
@@ -304,10 +288,10 @@ const ProductDetailScreen: React.FC = () => {
             showsHorizontalScrollIndicator={false}
             onMomentumScrollEnd={handleScroll}
           >
-            {product?.images.map((image, index) => (
+            {images?.map((image, index) => (
               <Image
                 key={index}
-                source={{ uri: image }}
+                source={{ uri: image.url }}
                 style={styles.productImage}
                 resizeMode="contain"
               />
@@ -316,7 +300,7 @@ const ProductDetailScreen: React.FC = () => {
 
           {/* Indicadores de imágenes */}
           <View style={styles.imageIndicators}>
-            {product?.images.map((_, index) => (
+            {images?.map((_, index) => (
               <TouchableOpacity
                 key={index}
                 onPress={() => scrollToImage(index)}
@@ -331,7 +315,15 @@ const ProductDetailScreen: React.FC = () => {
             ))}
           </View>
 
-          <PoppinsText style={styles.productName}>{product?.name}</PoppinsText>
+          <PoppinsText style={styles.productName}>
+            {product?.product.name +
+              ' ' +
+              product?.presentation.name +
+              ' ' +
+              product?.presentation.quantity +
+              ' ' +
+              product?.presentation.measurementUnit}
+          </PoppinsText>
 
           <RatingStars />
           {userRating > 0 && (
@@ -342,17 +334,15 @@ const ProductDetailScreen: React.FC = () => {
           )}
 
           <PoppinsText style={styles.description}>
-            {product?.description}
+            {product?.presentation.description}
           </PoppinsText>
 
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
-              <PoppinsText style={styles.price}>$ {currentPrice}</PoppinsText>
-              {product?.discount && (
-                <PoppinsText style={styles.discount}>
-                  -{product.discount}%
-                </PoppinsText>
+              <PoppinsText style={styles.price}>$ {product?.price}</PoppinsText>
+              {discount && (
+                <PoppinsText style={styles.discount}>-{discount}%</PoppinsText>
               )}
             </View>
             <PoppinsText style={styles.sectionTitle}>
@@ -362,8 +352,15 @@ const ProductDetailScreen: React.FC = () => {
               <Dropdown
                 placeholder="Presentación..."
                 options={
-                  product?.presentation.map(
-                    (p: { description: string }) => p.description,
+                  presentations?.map(
+                    (p: ProductPresentationResponse) =>
+                      product?.product.name +
+                      ' ' +
+                      p.presentation.name +
+                      ' ' +
+                      p.presentation.quantity +
+                      ' ' +
+                      p.presentation.measurementUnit,
                   ) || []
                 }
                 borderColor={Colors.gray_100}
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index aa9b442..c8ebc8c 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -32,6 +32,7 @@ export default function HomeScreen() {
       const pd = productsData.data.results;
       const carouselProducts = pd.map((p) => ({
         id: p.id,
+        presentationId: p.presentation.id,
         productId: p.product.id,
         imageUrl: p.product.images[0].url,
         name:
diff --git a/src/types/Product.ts b/src/types/Product.ts
index 2d5bb69..de32429 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -1,5 +1,6 @@
 export type Product = {
   id: string;
+  presentationId: string;
   productId: string;
   imageUrl: string;
   name: string;

From b9a639726002f59811c93a60b9fed1d8ec47463d Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 21 Apr 2025 19:47:34 -0400
Subject: [PATCH 135/291] Integrating delivery sdk in assigned orders

---
 package-lock.json                           |   9 +-
 package.json                                |   2 +-
 src/app/(delivery-tabs)/_layout.tsx         | 112 ++++-----
 src/components/AlertProvider.tsx            |  74 ++++++
 src/components/OrderCard.tsx                |   6 +-
 src/screens/delivery/DeliveryHomeScreen.tsx | 251 +++++++++++++++-----
 src/services/branches.ts                    |  28 +++
 src/services/delivery.ts                    | 100 ++++++++
 8 files changed, 467 insertions(+), 115 deletions(-)
 create mode 100644 src/components/AlertProvider.tsx
 create mode 100644 src/services/branches.ts
 create mode 100644 src/services/delivery.ts

diff --git a/package-lock.json b/package-lock.json
index fe72bd4..08715bd 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.4",
+        "@pharmatech/sdk": "^0.4.7",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3587,9 +3587,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.4",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.4.tgz",
-      "integrity": "sha512-kquo9r+V2JFvk8AQ99RhH88qI50TIiRY4UrLYrDkC2yLUSCpJrBoA9PEe8b8W8Zt3E9BpzqHEbbZ+7tp7l+ZhA==",
+      "version": "0.4.7",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.7.tgz",
+      "integrity": "sha512-wpDH3yfDVhDqNsZyaRSAhzGzrS09k6CDuPx4Ys/Yh4NWeNQ9Q412Mnps+tAzjYpW8fd5r3+FvgzRdfMfV/cnng==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
@@ -5658,6 +5658,7 @@
       "version": "1.8.4",
       "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
       "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
+      "license": "MIT",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
diff --git a/package.json b/package.json
index b6ea0ed..2345778 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.4",
+    "@pharmatech/sdk": "^0.4.7",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/app/(delivery-tabs)/_layout.tsx b/src/app/(delivery-tabs)/_layout.tsx
index 62657e6..9e1243f 100644
--- a/src/app/(delivery-tabs)/_layout.tsx
+++ b/src/app/(delivery-tabs)/_layout.tsx
@@ -1,3 +1,4 @@
+import React from 'react';
 import { Tabs } from 'expo-router';
 import { View, StyleSheet } from 'react-native';
 import { Colors } from '../../styles/theme';
@@ -8,64 +9,67 @@ import {
   LifebuoyIcon,
 } from 'react-native-heroicons/outline';
 import TopBarDelivery from '../../components/TopBarDelivery';
+import { AlertProvider } from '../../components/AlertProvider'; // Importar el AlertProvider
 
 export default function DeliveryTabLayout() {
   return (
-    <View style={styles.container}>
-      <TopBarDelivery />
-      <Tabs
-        screenOptions={{
-          tabBarActiveTintColor: Colors.primary,
-          tabBarStyle: { backgroundColor: Colors.secondaryWhite },
-        }}
-      >
-        <Tabs.Screen
-          name="index"
-          options={{
-            tabBarLabel: ({ color }) => (
-              <PoppinsText style={{ color: color, fontSize: 10 }}>
-                Home
-              </PoppinsText>
-            ),
-            headerShown: false,
-            title: 'Home',
-            tabBarIcon: () => (
-              <HomeIcon width={24} height={24} color={Colors.primary} />
-            ),
+    <AlertProvider>
+      <View style={styles.container}>
+        <TopBarDelivery />
+        <Tabs
+          screenOptions={{
+            tabBarActiveTintColor: Colors.primary,
+            tabBarStyle: { backgroundColor: Colors.secondaryWhite },
           }}
-        />
-        <Tabs.Screen
-          name="deliveryHistory"
-          options={{
-            tabBarLabel: ({ color }) => (
-              <PoppinsText style={{ color: color, fontSize: 10 }}>
-                Historial
-              </PoppinsText>
-            ),
-            headerShown: false,
-            title: 'Historial',
-            tabBarIcon: () => (
-              <ClockIcon width={24} height={24} color={Colors.primary} />
-            ),
-          }}
-        />
-        <Tabs.Screen
-          name="deliverySupport"
-          options={{
-            tabBarLabel: ({ color }) => (
-              <PoppinsText style={{ color: color, fontSize: 10 }}>
-                Soporte
-              </PoppinsText>
-            ),
-            headerShown: false,
-            title: 'Soporte',
-            tabBarIcon: () => (
-              <LifebuoyIcon width={24} height={24} color={Colors.primary} />
-            ),
-          }}
-        />
-      </Tabs>
-    </View>
+        >
+          <Tabs.Screen
+            name="index"
+            options={{
+              tabBarLabel: ({ color }) => (
+                <PoppinsText style={{ color: color, fontSize: 10 }}>
+                  Home
+                </PoppinsText>
+              ),
+              headerShown: false,
+              title: 'Home',
+              tabBarIcon: () => (
+                <HomeIcon width={24} height={24} color={Colors.primary} />
+              ),
+            }}
+          />
+          <Tabs.Screen
+            name="deliveryHistory"
+            options={{
+              tabBarLabel: ({ color }) => (
+                <PoppinsText style={{ color: color, fontSize: 10 }}>
+                  Historial
+                </PoppinsText>
+              ),
+              headerShown: false,
+              title: 'Historial',
+              tabBarIcon: () => (
+                <ClockIcon width={24} height={24} color={Colors.primary} />
+              ),
+            }}
+          />
+          <Tabs.Screen
+            name="deliverySupport"
+            options={{
+              tabBarLabel: ({ color }) => (
+                <PoppinsText style={{ color: color, fontSize: 10 }}>
+                  Soporte
+                </PoppinsText>
+              ),
+              headerShown: false,
+              title: 'Soporte',
+              tabBarIcon: () => (
+                <LifebuoyIcon width={24} height={24} color={Colors.primary} />
+              ),
+            }}
+          />
+        </Tabs>
+      </View>
+    </AlertProvider>
   );
 }
 
diff --git a/src/components/AlertProvider.tsx b/src/components/AlertProvider.tsx
new file mode 100644
index 0000000..9dda4fc
--- /dev/null
+++ b/src/components/AlertProvider.tsx
@@ -0,0 +1,74 @@
+import React, { createContext, useContext, useState } from 'react';
+import { View, StyleSheet } from 'react-native';
+import Alert from './Alerts';
+
+type AlertContextType = {
+  showAlert: (
+    type: 'success' | 'error' | 'info' | 'warning',
+    title: string,
+    message: string,
+  ) => void;
+};
+
+const AlertContext = createContext<AlertContextType | undefined>(undefined);
+
+export const AlertProvider: React.FC<{ children: React.ReactNode }> = ({
+  children,
+}) => {
+  const [visible, setVisible] = useState(false);
+  const [type, setType] = useState<'success' | 'error' | 'info' | 'warning'>(
+    'info',
+  );
+  const [title, setTitle] = useState('');
+  const [message, setMessage] = useState('');
+
+  const showAlert = (
+    alertType: 'success' | 'error' | 'info' | 'warning',
+    alertTitle: string,
+    alertMessage: string,
+  ) => {
+    setType(alertType);
+    setTitle(alertTitle);
+    setMessage(alertMessage);
+    setVisible(true);
+
+    // Ocultar la alerta automáticamente después de 3 segundos
+    setTimeout(() => setVisible(false), 3000);
+  };
+
+  return (
+    <AlertContext.Provider value={{ showAlert }}>
+      {children}
+      {visible && (
+        <View style={styles.alertContainer}>
+          <Alert
+            type={type}
+            title={title}
+            message={message}
+            borderColor
+            onClose={() => setVisible(false)}
+          />
+        </View>
+      )}
+    </AlertContext.Provider>
+  );
+};
+
+export const useAlert = (): AlertContextType => {
+  const context = useContext(AlertContext);
+  if (!context) {
+    throw new Error('useAlert must be used within an AlertProvider');
+  }
+  return context;
+};
+
+const styles = StyleSheet.create({
+  alertContainer: {
+    position: 'absolute',
+    top: 20,
+    left: '50%',
+    transform: [{ translateX: -163 }], // Centrar horizontalmente
+    zIndex: 1000,
+    width: 326,
+  },
+});
diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
index 4a621f1..5960184 100644
--- a/src/components/OrderCard.tsx
+++ b/src/components/OrderCard.tsx
@@ -44,7 +44,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
         >
           {orderType === 'pedido' ? 'Pedido' : 'Reubicación de productos'}
         </Badge>
-        <PoppinsText style={styles.elapsedTime}>{elapsedTime}</PoppinsText>
+        <PoppinsText style={styles.elapsedTime}>Hace {elapsedTime}</PoppinsText>
       </View>
 
       {/* Order Code */}
@@ -66,7 +66,9 @@ const OrderCard: React.FC<OrderCardProps> = ({
         </View>
         <View style={styles.detailRow}>
           <ClockIcon size={20} color={Colors.primary} />
-          <PoppinsText style={styles.detailText}>{estimatedTime}</PoppinsText>
+          <PoppinsText style={styles.detailText}>
+            Hora de entrega: {estimatedTime}
+          </PoppinsText>
         </View>
       </View>
 
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index fddcf29..da0c0e5 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -1,75 +1,212 @@
-import React from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  RefreshControl,
+} from 'react-native';
+import * as SecureStore from 'expo-secure-store';
 import { useRouter } from 'expo-router';
 import PoppinsText from '../../components/PoppinsText';
 import OrderCard from '../../components/OrderCard';
+import Popup from '../../components/Popup';
 import { Colors, FontSizes } from '../../styles/theme';
+import { DeliveryService } from '../../services/delivery';
+import { BranchService } from '../../services/branches';
+import {
+  OrderDeliveryDetailedResponse,
+  BranchResponse,
+  OrderDeliveryStatus,
+} from '@pharmatech/sdk';
+import { useAlert } from '../../components/AlertProvider'; // Importar el hook useAlert
 
 export default function DeliveryHomeScreen() {
   const router = useRouter();
+  const { showAlert } = useAlert(); // Usar el hook para acceder a la función showAlert
 
-  const orders: Array<{
-    id: string;
-    type: 'pedido' | 'reubicación';
-    address: string;
-    branch: string;
-    estimatedTime: string;
-    elapsedTime: string;
-  }> = [
-    {
-      id: '12345',
-      type: 'pedido',
-      address: 'Av. Principal 123, Ciudad',
-      branch: 'Sucursal Central',
-      estimatedTime: '30 minutos',
-      elapsedTime: 'Hace 10 minutos',
-    },
-    {
-      id: '67890',
-      type: 'reubicación',
-      address: 'Calle Secundaria 456, Ciudad',
-      branch: 'Sucursal Norte',
-      estimatedTime: '45 minutos',
-      elapsedTime: 'Hace 5 minutos',
-    },
-  ];
-
-  const handleTakeOrder = (order: {
-    id: string;
-    type: 'pedido' | 'reubicación';
-    address: string;
-    branch: string;
-    estimatedTime: string;
-    elapsedTime: string;
-  }) => {
+  const [orders, setOrders] = useState<OrderDeliveryDetailedResponse[]>([]);
+  const [branchNames, setBranchNames] = useState<Record<string, string>>({});
+  const [loading, setLoading] = useState<boolean>(true);
+  const [refreshing, setRefreshing] = useState<boolean>(false);
+  const [selectedOrder, setSelectedOrder] =
+    useState<OrderDeliveryDetailedResponse | null>(null);
+  const [showDiscardPopup, setShowDiscardPopup] = useState<boolean>(false);
+
+  const fetchAssignedOrders = async () => {
+    try {
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      const payload = JSON.parse(atob(jwt.split('.')[1]));
+      const employeeId = payload.sub;
+
+      const response = await DeliveryService.getAssignedOrders(employeeId);
+
+      const detailedOrders = await Promise.all(
+        response.results.map(async (order) => {
+          const details = await DeliveryService.getOrderDetails(order.id);
+          return details;
+        }),
+      );
+
+      const branchIds = [
+        ...new Set(detailedOrders.map((order) => order.branchId)),
+      ];
+      const branches = await BranchService.findAll({ page: 1, limit: 100 });
+      const branchMap = branches.results.reduce(
+        (acc: Record<string, string>, branch: BranchResponse) => {
+          if (branchIds.includes(branch.id)) {
+            acc[branch.id] = branch.name;
+          }
+          return acc;
+        },
+        {},
+      );
+
+      setBranchNames(branchMap);
+      setOrders(detailedOrders);
+    } catch (error) {
+      console.error('Error al obtener las órdenes asignadas:', error);
+      showAlert(
+        'error',
+        'Error',
+        'No se pudieron cargar las órdenes asignadas.',
+      );
+    } finally {
+      setLoading(false);
+      setRefreshing(false);
+    }
+  };
+
+  useEffect(() => {
+    fetchAssignedOrders();
+  }, []);
+
+  const handleTakeOrder = (order: OrderDeliveryDetailedResponse) => {
     const query = encodeURIComponent(JSON.stringify(order));
     router.push(`/deliveryDetail/${order.id}?data=${query}`);
   };
 
-  const handleDiscardOrder = (orderId: string) => {
-    console.log(`Descartar pedido: ${orderId}`);
+  const handleDiscardOrder = (order: OrderDeliveryDetailedResponse) => {
+    setSelectedOrder(order);
+    setShowDiscardPopup(true);
+  };
+
+  const confirmDiscardOrder = async () => {
+    if (!selectedOrder) return;
+
+    try {
+      setLoading(true);
+      await DeliveryService.updateOrderStatus(
+        selectedOrder.id,
+        OrderDeliveryStatus.TO_ASSIGN,
+      );
+      showAlert('success', 'Éxito', 'La orden ha sido descartada.');
+      setOrders((prevOrders) =>
+        prevOrders.filter((order) => order.id !== selectedOrder.id),
+      );
+    } catch (error) {
+      console.error('Error al descartar la orden:', error);
+      showAlert('error', 'Error', 'No se pudo descartar la orden.');
+    } finally {
+      setLoading(false);
+      setShowDiscardPopup(false);
+      setSelectedOrder(null);
+    }
+  };
+
+  const cancelDiscardOrder = () => {
+    setShowDiscardPopup(false);
+    setSelectedOrder(null);
+  };
+
+  const formatTime = (isoDate: string | Date): string => {
+    const date = typeof isoDate === 'string' ? new Date(isoDate) : isoDate;
+    return date.toLocaleTimeString('es-VE', {
+      hour: '2-digit',
+      minute: '2-digit',
+    });
+  };
+
+  const calculateElapsedTime = (createdAt: string): string => {
+    const now = new Date();
+    const createdDate = new Date(createdAt);
+    const diffInMinutes = Math.floor(
+      (now.getTime() - createdDate.getTime()) / (1000 * 60),
+    );
+
+    if (diffInMinutes < 60) {
+      return `${diffInMinutes} minutos`;
+    } else if (diffInMinutes < 1440) {
+      const hours = Math.floor(diffInMinutes / 60);
+      return `${hours} horas`;
+    } else {
+      const days = Math.floor(diffInMinutes / 1440);
+      return `${days} días`;
+    }
+  };
+
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchAssignedOrders();
   };
 
   return (
     <View style={styles.container}>
-      <PoppinsText style={styles.title} weight="regular">
-        Pedidos asignados
-      </PoppinsText>
-      <ScrollView showsVerticalScrollIndicator={false}>
-        {orders.map((order) => (
-          <OrderCard
-            key={order.id}
-            orderCode={order.id}
-            orderType={order.type}
-            address={order.address}
-            branch={order.branch}
-            estimatedTime={order.estimatedTime}
-            elapsedTime={order.elapsedTime}
-            onTakeOrder={() => handleTakeOrder(order)}
-            onDiscardOrder={() => handleDiscardOrder(order.id)}
+      <ScrollView
+        showsVerticalScrollIndicator={false}
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={[Colors.primary]}
           />
-        ))}
+        }
+      >
+        <PoppinsText style={styles.title} weight="regular">
+          Pedidos asignados
+        </PoppinsText>
+        {loading ? (
+          <ActivityIndicator size="large" color={Colors.primary} />
+        ) : orders.length === 0 ? (
+          <PoppinsText style={styles.noOrdersText}>
+            No tienes pedidos asignados.
+          </PoppinsText>
+        ) : (
+          orders.map((order) => (
+            <OrderCard
+              key={order.id}
+              orderCode={order.id.split('-')[0]} // Mostrar solo los primeros 8 caracteres
+              orderType="pedido"
+              address={order.address?.adress || 'Dirección no disponible'}
+              branch={branchNames[order.branchId] || 'Sucursal no disponible'}
+              estimatedTime={formatTime(order.estimatedTime)} // Pasar directamente la cadena ISO
+              elapsedTime={calculateElapsedTime(order.createdAt)}
+              onTakeOrder={() => handleTakeOrder(order)}
+              onDiscardOrder={() => handleDiscardOrder(order)}
+            />
+          ))
+        )}
       </ScrollView>
+
+      {/* Popup de confirmación para descartar orden */}
+      <Popup
+        visible={showDiscardPopup}
+        headerText="Descartar orden"
+        bodyText="¿Estás seguro de que deseas descartar esta orden? Esto notificará al administrador para reasignarla."
+        primaryButton={{
+          text: 'Descartar',
+          onPress: confirmDiscardOrder,
+        }}
+        secondaryButton={{
+          text: 'Cancelar',
+          onPress: cancelDiscardOrder,
+        }}
+        onClose={cancelDiscardOrder}
+      />
     </View>
   );
 }
@@ -87,4 +224,10 @@ const styles = StyleSheet.create({
     color: Colors.textMain,
     marginBottom: 16,
   },
+  noOrdersText: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textLowContrast,
+    textAlign: 'center',
+    marginTop: 16,
+  },
 });
diff --git a/src/services/branches.ts b/src/services/branches.ts
new file mode 100644
index 0000000..f88749f
--- /dev/null
+++ b/src/services/branches.ts
@@ -0,0 +1,28 @@
+import { api } from '../lib/sdkConfig';
+import { Pagination, BranchResponse } from '@pharmatech/sdk';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+type FindAllParams = {
+  page?: number;
+  limit?: number;
+  q?: string;
+  stateId?: string;
+};
+
+export const BranchService = {
+  findAll: async ({
+    page = 1,
+    limit = 100,
+    q,
+    stateId,
+  }: FindAllParams): Promise<Pagination<BranchResponse>> => {
+    try {
+      const response = await api.branch.findAll({ page, limit, q, stateId });
+
+      return response;
+    } catch (error) {
+      console.error('Error en BranchService.findAll:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
+};
diff --git a/src/services/delivery.ts b/src/services/delivery.ts
new file mode 100644
index 0000000..4db1418
--- /dev/null
+++ b/src/services/delivery.ts
@@ -0,0 +1,100 @@
+import { api } from '../lib/sdkConfig';
+import * as SecureStore from 'expo-secure-store';
+import {
+  OrderDeliveryStatus,
+  OrderDeliveryResponse,
+  OrderDeliveryDetailedResponse,
+  Pagination,
+  OrderDeliveryPaginationRequest,
+} from '@pharmatech/sdk';
+import { extractErrorMessage } from '../utils/errorHandler';
+
+export const DeliveryService = {
+  /**
+   * Listar órdenes asignadas al delivery.
+   * @param employeeId - ID del motorizado (delivery).
+   * @param status - Estado de las órdenes a filtrar (por defecto: 'ASSIGNED').
+   * @returns Lista paginada de órdenes asignadas.
+   */
+  getAssignedOrders: async (
+    employeeId: string,
+    status: OrderDeliveryStatus = OrderDeliveryStatus.ASSIGNED,
+  ): Promise<Pagination<OrderDeliveryResponse>> => {
+    try {
+      // Obtener el JWT del SecureStore
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      // Llamar al método findAll con el JWT
+      const response = await api.deliveryService.findAll(
+        {
+          employeeId,
+          status,
+          page: 1,
+          limit: 10,
+        } as OrderDeliveryPaginationRequest,
+        jwt, // Pasar el JWT como segundo argumento
+      );
+      return response;
+    } catch (error) {
+      console.error('Error al obtener las órdenes asignadas:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
+
+  /**
+   * Obtener detalles de una orden específica.
+   * @param orderId - ID de la orden de delivery.
+   * @returns Detalles completos de la orden.
+   */
+  getOrderDetails: async (
+    orderId: string,
+  ): Promise<OrderDeliveryDetailedResponse> => {
+    try {
+      // Obtener el JWT del SecureStore
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      // Llamar al método getById con el JWT
+      const response = await api.deliveryService.getById(orderId, jwt); // Pasar el JWT como segundo argumento
+      return response;
+    } catch (error) {
+      console.error('Error al obtener los detalles de la orden:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
+
+  /**
+   * Actualizar el estado de una orden de delivery.
+   * @param orderId - ID de la orden de delivery.
+   * @param status - Nuevo estado de la orden.
+   * @returns Respuesta actualizada de la orden.
+   */
+  updateOrderStatus: async (
+    orderId: string,
+    status: OrderDeliveryStatus,
+  ): Promise<OrderDeliveryResponse> => {
+    try {
+      // Obtener el JWT del SecureStore
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      // Llamar al método update del SDK con el JWT
+      const response = await api.deliveryService.update(
+        orderId,
+        { deliveryStatus: status },
+        jwt,
+      );
+      return response;
+    } catch (error) {
+      console.error('Error al actualizar el estado de la orden:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
+};

From cbde2e1b83858fde65b6a4c79328e9e19b548d13 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 00:41:07 -0400
Subject: [PATCH 136/291] Integrating delivery details

---
 src/components/CustomerAvatar.tsx             |  69 +++++
 src/components/DeliveryMap.tsx                | 182 +++++++++++++
 src/screens/delivery/DeliveryDetailScreen.tsx | 241 ++++++++++++++----
 src/services/delivery.ts                      |  34 ++-
 4 files changed, 466 insertions(+), 60 deletions(-)
 create mode 100644 src/components/CustomerAvatar.tsx
 create mode 100644 src/components/DeliveryMap.tsx

diff --git a/src/components/CustomerAvatar.tsx b/src/components/CustomerAvatar.tsx
new file mode 100644
index 0000000..f71a2ee
--- /dev/null
+++ b/src/components/CustomerAvatar.tsx
@@ -0,0 +1,69 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import PoppinsText from './PoppinsText';
+import { Colors } from '../styles/theme';
+
+type CustomerAvatarProps = {
+  firstName: string;
+  lastName: string;
+  scale?: number; // Propiedad opcional para definir el tamaño del avatar
+};
+
+const CustomerAvatar: React.FC<CustomerAvatarProps> = ({
+  firstName,
+  lastName,
+  scale = 32,
+}) => {
+  const getInitials = (firstName: string, lastName: string): string => {
+    return `${firstName.charAt(0).toUpperCase()}${lastName.charAt(0).toUpperCase()}`;
+  };
+
+  const initials = getInitials(firstName, lastName);
+
+  // Cálculo dinámico de tamaño y fuentes
+  const avatarSize = scale;
+  const fontSize = avatarSize / 2.5;
+  const lineHeight = fontSize + 1;
+  const marginTop = avatarSize / 10;
+
+  return (
+    <View
+      style={[
+        styles.avatar,
+        {
+          width: avatarSize,
+          height: avatarSize,
+          borderRadius: avatarSize / 2,
+        },
+      ]}
+    >
+      <PoppinsText
+        style={[
+          styles.initials,
+          {
+            fontSize: fontSize,
+            lineHeight: lineHeight,
+            marginTop: marginTop,
+          },
+        ]}
+        weight="semibold"
+      >
+        {initials}
+      </PoppinsText>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  avatar: {
+    backgroundColor: Colors.primary,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  initials: {
+    color: Colors.textWhite,
+    textAlign: 'center',
+  },
+});
+
+export default CustomerAvatar;
diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
new file mode 100644
index 0000000..de119ef
--- /dev/null
+++ b/src/components/DeliveryMap.tsx
@@ -0,0 +1,182 @@
+import React, { useEffect, useState } from 'react';
+import MapView, { Marker, Polyline } from 'react-native-maps';
+import { StyleSheet, View, Alert } from 'react-native';
+import * as Location from 'expo-location';
+
+interface DeliveryMapProps {
+  deliveryState: number;
+  branchLocation: { latitude: number; longitude: number };
+  customerLocation: { latitude: number; longitude: number };
+}
+
+const DeliveryMap: React.FC<DeliveryMapProps> = ({
+  //deliveryState,
+  branchLocation,
+  //customerLocation,
+}) => {
+  const [deliveryLocation, setDeliveryLocation] = useState<{
+    latitude: number;
+    longitude: number;
+  } | null>(null);
+  const [routeCoordinates, setRouteCoordinates] = useState<
+    { latitude: number; longitude: number }[]
+  >([]);
+
+  // Solicitar permisos y obtener la ubicación del delivery
+  useEffect(() => {
+    const getDeliveryLocation = async () => {
+      try {
+        const { status } = await Location.getForegroundPermissionsAsync();
+        if (status !== 'granted') {
+          const { status: newStatus } =
+            await Location.requestForegroundPermissionsAsync();
+          if (newStatus !== 'granted') {
+            Alert.alert(
+              'Permiso denegado',
+              'No se pudo obtener la ubicación del delivery.',
+            );
+            return;
+          }
+        }
+
+        const location = await Location.getCurrentPositionAsync({});
+        setDeliveryLocation({
+          latitude: location.coords.latitude,
+          longitude: location.coords.longitude,
+        });
+
+        // Obtener la ruta desde la ubicación del delivery hasta la sucursal
+        fetchRoute(
+          location.coords.latitude,
+          location.coords.longitude,
+          branchLocation.latitude,
+          branchLocation.longitude,
+        );
+      } catch (error) {
+        console.error('Error al obtener la ubicación del delivery:', error);
+        Alert.alert(
+          'Error',
+          'Hubo un problema al obtener la ubicación del delivery.',
+        );
+      }
+    };
+
+    getDeliveryLocation();
+  }, []);
+
+  // Obtener la ruta desde Google Maps Directions API
+  const fetchRoute = async (
+    originLat: number,
+    originLng: number,
+    destLat: number,
+    destLng: number,
+  ) => {
+    try {
+      const response = await fetch(
+        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU`,
+      );
+      const data = await response.json();
+
+      if (data.routes && data.routes.length > 0) {
+        const points = decodePolyline(data.routes[0].overview_polyline.points);
+        setRouteCoordinates(points);
+      } else {
+        console.error('No se pudo obtener la ruta.');
+      }
+    } catch (error) {
+      console.error('Error al obtener la ruta:', error);
+    }
+  };
+
+  // Decodificar la polyline de Google Maps
+  const decodePolyline = (encoded: string) => {
+    const points: { latitude: number; longitude: number }[] = [];
+    let index = 0;
+    const len = encoded.length;
+    let lat = 0,
+      lng = 0;
+
+    while (index < len) {
+      let b,
+        shift = 0,
+        result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlat = result & 1 ? ~(result >> 1) : result >> 1;
+      lat += dlat;
+
+      shift = 0;
+      result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlng = result & 1 ? ~(result >> 1) : result >> 1;
+      lng += dlng;
+
+      points.push({
+        latitude: lat / 1e5,
+        longitude: lng / 1e5,
+      });
+    }
+
+    return points;
+  };
+
+  return (
+    <View style={styles.container}>
+      <MapView
+        style={styles.map}
+        initialRegion={{
+          latitude: branchLocation.latitude,
+          longitude: branchLocation.longitude,
+          latitudeDelta: 0.05,
+          longitudeDelta: 0.05,
+        }}
+      >
+        {/* Mostrar la ubicación del delivery */}
+        {deliveryLocation && (
+          <Marker
+            coordinate={deliveryLocation}
+            title="Tu ubicación"
+            pinColor="red"
+          />
+        )}
+
+        {/* Mostrar la ubicación de la sucursal */}
+        <Marker
+          coordinate={branchLocation}
+          title="Sucursal de origen"
+          pinColor="blue"
+        />
+
+        {/* Mostrar la ruta */}
+        {routeCoordinates.length > 0 && (
+          <Polyline
+            coordinates={routeCoordinates}
+            strokeColor="blue"
+            strokeWidth={4}
+          />
+        )}
+      </MapView>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    height: 300,
+    borderRadius: 16,
+    overflow: 'hidden',
+    marginBottom: 16,
+  },
+  map: {
+    flex: 1,
+  },
+});
+
+export default DeliveryMap;
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index b9f8a80..dea6503 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -1,42 +1,37 @@
-import React, { useState } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
-import { useLocalSearchParams } from 'expo-router';
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import { useLocalSearchParams, useRouter } from 'expo-router';
 import {
   InformationCircleIcon,
   BuildingStorefrontIcon,
   MapPinIcon,
   PhoneIcon,
-  EnvelopeIcon,
 } from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
 import PoppinsText from '../../components/PoppinsText';
 import Button from '../../components/Button';
+import DeliveryMap from '../../components/DeliveryMap';
+import CustomerAvatar from '../../components/CustomerAvatar';
 import { Colors, FontSizes } from '../../styles/theme';
-
-interface Product {
-  id: string;
-  name: string;
-  quantity: number;
-}
+import { DeliveryService } from '../../services/delivery';
+import { BranchService } from '../../services/branches';
+import {
+  OrderDeliveryDetailedResponse,
+  OrderDeliveryStatus,
+  BranchResponse,
+} from '@pharmatech/sdk';
 
 const DeliveryDetailScreen: React.FC = () => {
-  const { data } = useLocalSearchParams();
-
-  const orderData = data
-    ? JSON.parse(decodeURIComponent(data as string))
-    : null;
-
-  if (!orderData) {
-    return (
-      <View style={styles.errorContainer}>
-        <PoppinsText style={styles.errorText}>
-          No se encontraron datos del pedido.
-        </PoppinsText>
-      </View>
-    );
-  }
-
+  const { id } = useLocalSearchParams();
+  const [orderDetails, setOrderDetails] =
+    useState<OrderDeliveryDetailedResponse | null>(null);
+  const [branchNames, setBranchNames] = useState<
+    Record<string, { name: string; latitude: number; longitude: number }>
+  >({});
+  const [loading, setLoading] = useState(true);
   const [deliveryState, setDeliveryState] = useState(0);
+  const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
+  const router = useRouter();
 
   const deliveryStates = [
     'Buscando pedido en sucursal de origen',
@@ -52,12 +47,135 @@ const DeliveryDetailScreen: React.FC = () => {
     'Finalizar entrega',
   ];
 
-  const handleNextState = () => {
-    if (deliveryState < buttonStates.length - 1) {
-      setDeliveryState(deliveryState + 1);
+  const branchLocation = {
+    latitude: branchNames[orderDetails?.branchId ?? '']?.latitude || 0,
+    longitude: branchNames[orderDetails?.branchId ?? '']?.longitude || 0,
+  };
+
+  const customerLocation = {
+    latitude: 0,
+    longitude: 0,
+  };
+
+  useEffect(() => {
+    const fetchOrderDetails = async () => {
+      try {
+        console.log('Fetching order details for delivery ID:', id);
+        const details = await DeliveryService.getOrderDetails(id as string);
+        console.log('Order details fetched:', details);
+
+        setOrderDetails(details);
+
+        // Obtener todas las sucursales y mapear sus nombres y coordenadas
+        const branches = await BranchService.findAll({ page: 1, limit: 100 });
+        const branchMap = branches.results.reduce(
+          (
+            acc: Record<
+              string,
+              { name: string; latitude: number; longitude: number }
+            >,
+            branch: BranchResponse,
+          ) => {
+            acc[branch.id] = {
+              name: branch.name,
+              latitude: branch.latitude,
+              longitude: branch.longitude,
+            };
+            return acc;
+          },
+          {},
+        );
+
+        setBranchNames(branchMap);
+      } catch (error) {
+        console.error('Error al obtener los detalles del pedido:', error);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchOrderDetails();
+  }, [id]);
+
+  const handleNextState = async () => {
+    console.log(
+      'handleNextState called, current deliveryState:',
+      deliveryState,
+    );
+    console.log('Current button state:', buttonStates[deliveryState]);
+    console.log('deliveryState:', deliveryState);
+    console.log('buttonStates[deliveryState]:', buttonStates[deliveryState]);
+    console.log(
+      'Comparison result:',
+      buttonStates[deliveryState] === 'Finalizar entrega',
+    );
+
+    try {
+      if (deliveryState === 5) {
+        console.log('Forcing Finalizar entrega case');
+        router.replace('/(delivery-tabs)');
+        return;
+      }
+
+      if (deliveryState < buttonStates.length - 1) {
+        // Verifica si el estado actual es "Finalizar entrega"
+        if (buttonStates[deliveryState] === 'Finalizar entrega') {
+          console.log('Finalizar entrega case triggered');
+          router.replace('/login');
+          return;
+        }
+
+        // Actualizar el estado en el backend según el botón actual
+        switch (buttonStates[deliveryState]) {
+          case 'Comenzar entrega':
+            await DeliveryService.updateOrderStatus(
+              orderDetails!.id,
+              OrderDeliveryStatus.WAITING_CONFIRMATION,
+            );
+            break;
+          case 'Ya tengo los productos del pedido':
+            await DeliveryService.updateOrderStatus(
+              orderDetails!.id,
+              OrderDeliveryStatus.PICKED_UP,
+            );
+            break;
+          case 'Ir a destino de entrega':
+            await DeliveryService.updateOrderStatus(
+              orderDetails!.id,
+              OrderDeliveryStatus.IN_ROUTE,
+            );
+            setDeliveryStateBadge(1); // Cambiar a "Haciendo entrega del pedido"
+            break;
+          case 'Ya hice la entrega':
+            await DeliveryService.updateOrderStatus(
+              orderDetails!.id,
+              OrderDeliveryStatus.DELIVERED,
+            );
+            break;
+        }
+
+        // Avanzar al siguiente estado del botón
+        setDeliveryState(deliveryState + 1);
+      }
+    } catch (error) {
+      console.error('Error al actualizar el estado del delivery:', error);
     }
   };
 
+  if (loading) {
+    return <ActivityIndicator size="large" color={Colors.primary} />;
+  }
+
+  if (!orderDetails) {
+    return (
+      <View style={styles.errorContainer}>
+        <PoppinsText style={styles.errorText}>
+          No se encontraron datos del pedido.
+        </PoppinsText>
+      </View>
+    );
+  }
+
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <ScrollView contentContainerStyle={styles.container}>
@@ -72,12 +190,12 @@ const DeliveryDetailScreen: React.FC = () => {
           <PoppinsText style={styles.statusLabel}>Estado:</PoppinsText>
           <Badge
             variant="filled"
-            color={orderData.type === 'pedido' ? 'info' : 'secondary_300'}
+            color="info"
             size="small"
             borderRadius="square"
             textColor={Colors.primary}
           >
-            {deliveryStates[deliveryState < 3 ? 0 : 1]}
+            {deliveryStates[deliveryStateBadge]}
           </Badge>
         </View>
 
@@ -104,11 +222,12 @@ const DeliveryDetailScreen: React.FC = () => {
                 style={styles.icon}
               />
               <PoppinsText style={styles.cardTitle}>
-                {orderData.branch}
+                Sucursal de origen
               </PoppinsText>
             </View>
             <PoppinsText style={styles.cardSubtitle}>
-              {orderData.address}
+              {branchNames[orderDetails.branchId]?.name ||
+                'Sucursal no disponible'}
             </PoppinsText>
           </View>
 
@@ -123,7 +242,10 @@ const DeliveryDetailScreen: React.FC = () => {
               <PoppinsText style={styles.cardTitle}>Entrega</PoppinsText>
             </View>
             <PoppinsText style={styles.cardSubtitle}>
-              {orderData.address}
+              {orderDetails.address.adress}
+            </PoppinsText>
+            <PoppinsText style={styles.cardSubtitle}>
+              {orderDetails.address.referencePoint || 'Sin referencia'}
             </PoppinsText>
           </View>
         </View>
@@ -133,21 +255,25 @@ const DeliveryDetailScreen: React.FC = () => {
           Información de contacto
         </PoppinsText>
         <View style={styles.card3}>
-          {/* Teléfono */}
+          {/* Avatar del cliente */}
           <View style={styles.cardRow}>
-            <PhoneIcon size={20} color={Colors.primary} style={styles.icon} />
-            <PoppinsText style={styles.cardSubtitle1}>+123456789</PoppinsText>
+            <View style={styles.icon}>
+              <CustomerAvatar
+                firstName={orderDetails.user.firstName}
+                lastName={orderDetails.user.lastName}
+                scale={20}
+              />
+            </View>
+            <PoppinsText style={styles.cardSubtitle1}>
+              {orderDetails.user.firstName} {orderDetails.user.lastName}
+            </PoppinsText>
           </View>
 
-          {/* Correo */}
+          {/* Teléfono */}
           <View style={styles.cardRow}>
-            <EnvelopeIcon
-              size={20}
-              color={Colors.primary}
-              style={styles.icon}
-            />
+            <PhoneIcon size={20} color={Colors.primary} style={styles.icon} />
             <PoppinsText style={styles.cardSubtitle1}>
-              cliente@correo.com
+              {orderDetails.user.phoneNumber}
             </PoppinsText>
           </View>
         </View>
@@ -156,28 +282,35 @@ const DeliveryDetailScreen: React.FC = () => {
         <PoppinsText weight="medium" style={styles.sectionTitle}>
           Recorrido de entrega
         </PoppinsText>
-        <View style={styles.mapPlaceholder} />
+        <DeliveryMap
+          deliveryState={deliveryState}
+          branchLocation={branchLocation}
+          customerLocation={customerLocation}
+        />
 
-        {/* Pedido */}
-        <PoppinsText weight="medium" style={styles.sectionTitle}>
+        {/* Pedido (contenido comentado) */}
+        {/* <PoppinsText weight="medium" style={styles.sectionTitle}>
           Pedido
         </PoppinsText>
         <PoppinsText style={styles.totalProducts}>
-          Total: {orderData.products?.length || 0} productos
+          Total: {products.length} productos
         </PoppinsText>
-        {orderData.products?.map((product: Product) => (
+        {products.map((product) => (
           <View key={product.id} style={styles.productCard}>
             <View style={styles.productImagePlaceholder} />
             <View>
               <PoppinsText style={styles.productName}>
-                {product.name}
+                {product.productPresentation.product.name}
               </PoppinsText>
               <PoppinsText style={styles.productQuantity}>
                 Cantidad: {product.quantity}
               </PoppinsText>
+              <PoppinsText style={styles.productPrice}>
+                Subtotal: ${product.subtotal.toFixed(2)}
+              </PoppinsText>
             </View>
           </View>
-        ))}
+        ))} */}
 
         {/* Espaciado adicional al final */}
         <View style={styles.scrollSpacer} />
@@ -340,6 +473,10 @@ const styles = StyleSheet.create({
     fontSize: FontSizes.b3.size,
     color: Colors.textLowContrast,
   },
+  productPrice: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+  },
   floatingButton: {
     position: 'absolute',
     bottom: 16,
@@ -356,7 +493,7 @@ const styles = StyleSheet.create({
     color: Colors.semanticDanger,
   },
   scrollSpacer: {
-    height: 64,
+    height: 64 + 16,
   },
 });
 
diff --git a/src/services/delivery.ts b/src/services/delivery.ts
index 4db1418..cad37be 100644
--- a/src/services/delivery.ts
+++ b/src/services/delivery.ts
@@ -6,6 +6,7 @@ import {
   OrderDeliveryDetailedResponse,
   Pagination,
   OrderDeliveryPaginationRequest,
+  OrderDetailResponse,
 } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
@@ -21,13 +22,11 @@ export const DeliveryService = {
     status: OrderDeliveryStatus = OrderDeliveryStatus.ASSIGNED,
   ): Promise<Pagination<OrderDeliveryResponse>> => {
     try {
-      // Obtener el JWT del SecureStore
       const jwt = await SecureStore.getItemAsync('auth_token');
       if (!jwt) {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      // Llamar al método findAll con el JWT
       const response = await api.deliveryService.findAll(
         {
           employeeId,
@@ -35,7 +34,7 @@ export const DeliveryService = {
           page: 1,
           limit: 10,
         } as OrderDeliveryPaginationRequest,
-        jwt, // Pasar el JWT como segundo argumento
+        jwt,
       );
       return response;
     } catch (error) {
@@ -53,14 +52,12 @@ export const DeliveryService = {
     orderId: string,
   ): Promise<OrderDeliveryDetailedResponse> => {
     try {
-      // Obtener el JWT del SecureStore
       const jwt = await SecureStore.getItemAsync('auth_token');
       if (!jwt) {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      // Llamar al método getById con el JWT
-      const response = await api.deliveryService.getById(orderId, jwt); // Pasar el JWT como segundo argumento
+      const response = await api.deliveryService.getById(orderId, jwt);
       return response;
     } catch (error) {
       console.error('Error al obtener los detalles de la orden:', error);
@@ -68,6 +65,29 @@ export const DeliveryService = {
     }
   },
 
+  /**
+   * Obtener los productos de una orden específica.
+   * @param orderId - ID de la orden.
+   * @returns Lista de productos de la orden.
+   */
+  getOrderProducts: async (orderId: string): Promise<OrderDetailResponse[]> => {
+    try {
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      console.log('Fetching products for order ID:', orderId);
+      const orderDetails = await api.order.getById(orderId, jwt);
+      console.log('Order details fetched:', orderDetails);
+
+      return orderDetails.details; // Retornar solo los productos
+    } catch (error) {
+      console.error('Error al obtener los productos de la orden:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
+
   /**
    * Actualizar el estado de una orden de delivery.
    * @param orderId - ID de la orden de delivery.
@@ -79,13 +99,11 @@ export const DeliveryService = {
     status: OrderDeliveryStatus,
   ): Promise<OrderDeliveryResponse> => {
     try {
-      // Obtener el JWT del SecureStore
       const jwt = await SecureStore.getItemAsync('auth_token');
       if (!jwt) {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      // Llamar al método update del SDK con el JWT
       const response = await api.deliveryService.update(
         orderId,
         { deliveryStatus: status },

From a8e33d31d5a851b7dc49fc0e8e83860f27aec9ac Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 22 Apr 2025 01:01:15 -0400
Subject: [PATCH 137/291] Updated searchProduct page, added filterOptions

---
 src/app/_layout.tsx                           |   1 +
 .../[search].tsx => search/[query].tsx}       |   0
 src/app/search/_layout.tsx                    |  12 +
 src/components/FilterOptions.tsx              | 126 ++++
 src/components/SearchInput.tsx                | 126 +++-
 src/screens/SearchProductScreen.tsx           | 541 +++---------------
 src/services/products.ts                      |  26 +
 7 files changed, 357 insertions(+), 475 deletions(-)
 rename src/app/{products/[search].tsx => search/[query].tsx} (100%)
 create mode 100644 src/app/search/_layout.tsx
 create mode 100644 src/components/FilterOptions.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 229d4e5..cb38d4e 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -69,6 +69,7 @@ export default function RootLayout() {
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
         <Stack.Screen name="products" options={{ headerShown: false }} />
+        <Stack.Screen name="search" options={{ headerShown: false }} />
         <Stack.Screen
           name="profile"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/app/products/[search].tsx b/src/app/search/[query].tsx
similarity index 100%
rename from src/app/products/[search].tsx
rename to src/app/search/[query].tsx
diff --git a/src/app/search/_layout.tsx b/src/app/search/_layout.tsx
new file mode 100644
index 0000000..7f2e24a
--- /dev/null
+++ b/src/app/search/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function SearchLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/components/FilterOptions.tsx b/src/components/FilterOptions.tsx
new file mode 100644
index 0000000..ef7c865
--- /dev/null
+++ b/src/components/FilterOptions.tsx
@@ -0,0 +1,126 @@
+import React, { useRef } from 'react';
+import {
+  View,
+  StyleSheet,
+  PanResponder,
+  Animated,
+  Dimensions,
+  TouchableWithoutFeedback,
+  Modal,
+} from 'react-native';
+import { Colors } from '../styles/theme';
+
+type FilterOptionsProps = {
+  visible: boolean;
+  onClose: () => void;
+  children: React.ReactNode;
+};
+
+const FilterOptions: React.FC<FilterOptionsProps> = ({
+  visible,
+  onClose,
+  children,
+}) => {
+  const screenHeight = Dimensions.get('screen').height;
+  const panY = useRef(new Animated.Value(screenHeight)).current;
+
+  const resetPositionAnim = Animated.timing(panY, {
+    toValue: 0,
+    duration: 300,
+    useNativeDriver: true,
+  });
+
+  const closeAnim = Animated.timing(panY, {
+    toValue: screenHeight,
+    duration: 500,
+    useNativeDriver: true,
+  });
+
+  const panResponders = useRef(
+    PanResponder.create({
+      onStartShouldSetPanResponder: () => true,
+      onMoveShouldSetPanResponder: () => false,
+      onPanResponderMove: Animated.event([null, { dy: panY }], {
+        useNativeDriver: false,
+      }),
+      onPanResponderRelease: (_, gs) => {
+        if (gs.dy > 0 && gs.vy > 0.5) {
+          return closeSheet();
+        }
+        return resetPositionAnim.start();
+      },
+    }),
+  ).current;
+
+  React.useEffect(() => {
+    if (visible) {
+      resetPositionAnim.start();
+    } else {
+      closeAnim.start();
+    }
+  }, [visible]);
+
+  const closeSheet = () => {
+    closeAnim.start(() => onClose());
+  };
+
+  return (
+    <Modal
+      animated
+      animationType="fade"
+      visible={visible}
+      transparent
+      onRequestClose={closeSheet}
+    >
+      <TouchableWithoutFeedback onPress={closeSheet}>
+        <View style={styles.overlay}>
+          <Animated.View
+            style={[
+              styles.container,
+              {
+                transform: [{ translateY: panY }],
+              },
+            ]}
+            {...panResponders.panHandlers}
+          >
+            <View style={styles.sliderIndicatorRow}>
+              <View style={styles.sliderIndicator} />
+            </View>
+            {children}
+          </Animated.View>
+        </View>
+      </TouchableWithoutFeedback>
+    </Modal>
+  );
+};
+
+const styles = StyleSheet.create({
+  overlay: {
+    backgroundColor: 'rgba(0,0,0,0.5)',
+    flex: 1,
+    justifyContent: 'flex-end',
+  },
+  container: {
+    backgroundColor: Colors.bgColor,
+    paddingVertical: 12,
+    paddingHorizontal: 12,
+    borderTopRightRadius: 12,
+    borderTopLeftRadius: 12,
+    minHeight: 200,
+    maxHeight: '80%',
+  },
+  sliderIndicatorRow: {
+    flexDirection: 'row',
+    marginBottom: 4,
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  sliderIndicator: {
+    backgroundColor: '#CECECE',
+    height: 4,
+    width: 45,
+    borderRadius: 2,
+  },
+});
+
+export default FilterOptions;
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index f4ae48d..b733cc3 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -1,5 +1,11 @@
-import React, { useState } from 'react';
-import { View, TextInput, StyleSheet, TouchableOpacity } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import {
+  View,
+  TextInput,
+  StyleSheet,
+  TouchableOpacity,
+  ScrollView,
+} from 'react-native';
 import {
   ArrowRightIcon,
   MagnifyingGlassIcon,
@@ -7,6 +13,9 @@ import {
 } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
+import { router } from 'expo-router';
+import { ProductService } from '../services/products';
+import { ProductPresentation } from '@pharmatech/sdk';
 
 interface SearchInputProps {
   placeholder?: string;
@@ -26,6 +35,17 @@ const SearchInput: React.FC<SearchInputProps> = ({
   showClearButton = true,
 }) => {
   const [search, setSearch] = useState('');
+  const [result, setResult] = useState<ProductPresentation[]>();
+
+  useEffect(() => {
+    const fetchQuery = async () => {
+      const resultData = await ProductService.getProducts(1, 20, { q: search });
+
+      if (resultData.success) setResult(resultData.data.results);
+    };
+
+    fetchQuery();
+  }, [search]);
   return (
     <>
       <View style={[styles.container, style]}>
@@ -74,23 +94,103 @@ const SearchInput: React.FC<SearchInputProps> = ({
               padding: 10,
               borderRadius: 5,
               flex: 1,
+              borderWidth: 1,
+              borderColor: Colors.gray_100,
             }}
           >
-            <View style={{ flexDirection: 'row' }}>
-              <PoppinsText>Sugerencias</PoppinsText>
-              <PoppinsText style={{ flex: 1, flexWrap: 'wrap' }}>
-                Productos que coinciden con &quot;{search}&quot;
-              </PoppinsText>
-            </View>
-            <View></View>
             <View
-              style={{ flexDirection: 'row', justifyContent: 'space-between' }}
+              style={{
+                flexDirection: 'row',
+                padding: 1,
+                borderBottomWidth: 1,
+                borderColor: Colors.gray_100,
+              }}
             >
-              <PoppinsText style={{ flex: 1, flexWrap: 'wrap' }}>
-                Buscar &quot;{search}&quot;
+              <PoppinsText style={{ fontSize: FontSizes.c1.size, width: 130 }}>
+                Sugerencias
+              </PoppinsText>
+              <PoppinsText
+                style={{
+                  flex: 1,
+                  flexWrap: 'wrap',
+                  fontSize: FontSizes.c1.size,
+                }}
+              >
+                Productos que coinciden con &quot;{search}&quot;
               </PoppinsText>
-              <ArrowRightIcon size={20} color={Colors.gray_500} />
             </View>
+            <ScrollView style={{ height: 400 }}>
+              {result?.map((p, index) => (
+                <TouchableOpacity
+                  key={index}
+                  style={{ flexDirection: 'row' }}
+                  onPress={() =>
+                    router.push(
+                      `/products/${p.product.id}/presentation/${p.presentation.id}`,
+                    )
+                  }
+                >
+                  <View style={{ width: 130 }}>
+                    <PoppinsText
+                      style={{
+                        flex: 1,
+                        flexWrap: 'wrap',
+                        fontSize: FontSizes.c1.size,
+                      }}
+                    >
+                      {p.product.categories[0].name}
+                    </PoppinsText>
+                  </View>
+                  <View>
+                    <View></View>
+                    <View style={{ padding: 1 }}>
+                      <PoppinsText
+                        style={{
+                          flex: 1,
+                          flexWrap: 'wrap',
+                          fontSize: FontSizes.c1.size,
+                        }}
+                      >
+                        {p?.product?.name +
+                          ' ' +
+                          p?.presentation?.quantity +
+                          ' ' +
+                          p?.presentation?.measurementUnit +
+                          ' ' +
+                          p?.product?.categories[0].name +
+                          '. ' +
+                          p?.product?.description +
+                          '\n' +
+                          'Bs.' +
+                          p?.price}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                </TouchableOpacity>
+              ))}
+            </ScrollView>
+            <TouchableOpacity onPress={() => router.push(`/search/${search}`)}>
+              <View
+                style={{
+                  flexDirection: 'row',
+                  justifyContent: 'space-between',
+                  padding: 1,
+                  borderTopWidth: 1,
+                  borderColor: Colors.gray_100,
+                }}
+              >
+                <PoppinsText
+                  style={{
+                    flex: 1,
+                    flexWrap: 'wrap',
+                    fontSize: FontSizes.c1.size,
+                  }}
+                >
+                  Buscar &quot;{search}&quot;
+                </PoppinsText>
+                <ArrowRightIcon size={20} color={Colors.gray_500} />
+              </View>
+            </TouchableOpacity>
           </View>
         </View>
       )}
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 6f1d0b0..48c17c8 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -1,497 +1,114 @@
-import React, { useState, useRef, useEffect } from 'react';
+import React, { useState, useEffect } from 'react';
 import {
   View,
-  Image,
-  ScrollView,
   StyleSheet,
   TouchableOpacity,
   SafeAreaView,
   Dimensions,
-  NativeSyntheticEvent,
-  NativeScrollEvent,
 } from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
-import { useCart } from '../hooks/useCart';
-import { Product as CardProduct } from '../types/Product';
-import {
-  CheckCircleIcon,
-  StarIcon,
-  ChevronLeftIcon,
-} from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
-import Dropdown from '../components/Dropdown';
-import CardButton from '../components/CardButton';
 import PoppinsText from '../components/PoppinsText';
 import { ProductService } from '../services/products';
-import {
-  AdjustmentsHorizontalIcon,
-  TruckIcon,
-} from 'react-native-heroicons/outline';
-import Carousel from '../components/Carousel';
-import { StateService } from '../services/state';
-import { Inventory, State } from '../types/api';
-import { InventoryService } from '../services/inventory';
-import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
-import BranchMap from '../components/BranchMap';
-
-type Product = {
-  id: string;
-  name: string;
-  description: string | undefined;
-  rating: number;
-  discount: number;
-  presentation: { id: string; description: string; price: number }[];
-  images: string[];
-};
+import { AdjustmentsHorizontalIcon } from 'react-native-heroicons/solid';
+import FilterOptions from '../components/FilterOptions';
+import { ManufacturerResponse, ProductPresentation } from '@pharmatech/sdk';
+import Checkbox from '../components/Checkbox';
+import Steps from '../components/Steps';
+import Button from '../components/Button';
 
 export default function SearchProductScreen() {
-  const { id } = useLocalSearchParams<{ id: string }>();
-  const navigation = useNavigation(); // Obtén la instancia de navegación
-
-  const [inventory, setInventory] = useState<Inventory[]>([]);
-  const [states, setStates] = useState<State[]>([]);
-  const [product, setProduct] = useState<Product>();
-  const [products, setProducts] = useState<CardProduct[]>([]);
-  const [userRating, setUserRating] = useState<number>(0);
-  const [hoverRating, setHoverRating] = useState<number>(0);
-  const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
-  const [currentPrice, setCurrentPrice] = useState<number>(0);
-  const imagesScrollRef = useRef<ScrollView>(null);
-
-  const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
-    useCart();
-
-  const getQuantity = (): number => {
-    return product?.id ? getItemQuantity(product.id) : 0;
-  };
-
-  const obtainProducts = async () => {
-    const productsData = await ProductService.getProducts(1, 20);
+  const { query } = useLocalSearchParams<{ query: string }>();
 
-    if (productsData.success) {
-      const pd = productsData.data.results;
-      const carouselProducts = pd.map((p) => ({
-        id: p.product.id,
-        imageUrl: p.product.images[0].url,
-        name: p.product.name,
-        category: p.product.categories[0].name,
-        originalPrice: p.price,
-        discount: 10,
-        finalPrice: p.price - p.price * 0.1,
-        quantity: getItemQuantity(p.product.id),
-        getQuantity: (quantity: number) => {
-          addToCart({
-            id: p.product.id,
-            name: p.product.name,
-            price: p.price,
-            quantity,
-            image: p.product.images[0].url,
-          });
-          updateCartQuantity(p.product.id, quantity);
-        },
-      }));
-
-      setProducts(carouselProducts);
-    } else {
-      console.log(productsData.error);
-    }
-  };
-
-  const changePresentation = (description: string) => {
-    const presentation = product?.presentation.find(
-      (p) => p.description === description,
-    );
-    if (presentation && 'price' in presentation)
-      setCurrentPrice(presentation.price);
-  };
-
-  useEffect(() => {
-    obtainProducts();
-  }, [cartItems]);
+  const [search, setSearch] = useState<ProductPresentation[]>();
+  const [isVisible, setIsVisible] = useState(false);
+  const [brands, setBrands] = useState<ManufacturerResponse[]>();
 
   useEffect(() => {
-    const obtainProducts = async () => {
-      const productsData = await ProductService.getGenericProduct(id);
-      const productsPresentation =
-        await ProductService.getProductPresentations(id);
-      const productsImage = await ProductService.getProductImages(id);
-
-      const states = await StateService.getStates(1, 40);
-
-      if (states.success) {
-        setStates(states.data.results);
-      }
-
-      if (productsData.success) {
-        setProduct({
-          id: productsData.data.id,
-          name: productsData.data.name,
-          description: productsPresentation.success
-            ? productsData.data.description
-            : undefined,
-          rating: 0,
-          images: productsImage.success
-            ? productsImage.data.map((image: { url: string }) => image.url)
-            : [],
-          discount: 10,
-          presentation: productsPresentation.success
-            ? productsPresentation.data.map(
-                (presentation: {
-                  id: string;
-                  presentation: { description: string };
-                  price: number;
-                }) => ({
-                  id: presentation.id,
-                  description: presentation.presentation.description,
-                  price: presentation.price,
-                }),
-              )
-            : [],
-        });
-
-        setCurrentPrice(
-          productsPresentation.success ? productsPresentation.data[0].price : 0,
-        );
-      }
+    const fetchSearchData = async () => {
+      const searchData = await ProductService.getProducts(1, 20, { q: query });
+      const brands = await ProductService.getBrands(1, 100);
+      console.log(search);
+      if (searchData.success) setSearch(searchData.data.results);
+      if (brands.success) setBrands(brands.data.results);
     };
 
-    obtainProducts();
+    fetchSearchData();
   }, []);
 
-  useEffect(() => {
-    const fetchInventory = async () => {
-      if (product?.presentation) {
-        for (const p of product.presentation) {
-          const inventoryData = await InventoryService.getPresentationInventory(
-            1,
-            20,
-            p.id || '',
-          );
-          if (inventoryData.success) {
-            const newInventory = inventoryData.data.results.map((inv) => ({
-              id: inv.id,
-              branch: {
-                id: inv.branch.id,
-                name: inv.branch.name,
-                address: inv.branch.address,
-                latitude: inv.branch.latitude,
-                longitude: inv.branch.longitude,
-              },
-              stockQuantity: inv.stockQuantity, // Mover al nivel superior
-            }));
-
-            setInventory((prevInventory) => {
-              const updatedInventory = [...prevInventory];
-              newInventory.forEach((newItem) => {
-                if (!prevInventory.some((item) => item.id === newItem.id)) {
-                  updatedInventory.push(newItem as Inventory);
-                }
-              });
-              return updatedInventory;
-            });
-          } else {
-            console.error(inventoryData.error);
-          }
-        }
-      }
-    };
-    fetchInventory();
-  }, [product]);
-
-  const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
-    const contentOffsetX = event.nativeEvent.contentOffset.x;
-    const newIndex = Math.round(contentOffsetX / width);
-    setCurrentImageIndex(newIndex);
-  };
-
-  const scrollToImage = (index: number) => {
-    setCurrentImageIndex(index);
-    if (imagesScrollRef.current) {
-      imagesScrollRef.current.scrollTo({
-        x: index * width,
-        animated: true,
-      });
-    }
-  };
-
-  const handleRating = (rating: number) => {
-    setUserRating(rating);
-    // Aquí podrías enviar la calificación a tu API
-    console.log('Calificación enviada:', rating);
-  };
-
-  const RatingStars = () => {
-    return (
-      <View style={styles.ratingStarsContainer}>
-        {[1, 2, 3, 4, 5].map((star) => (
-          <TouchableOpacity
-            key={star}
-            activeOpacity={0.7}
-            onPress={() => handleRating(star)}
-            onPressIn={() => setHoverRating(star)}
-            onPressOut={() => setHoverRating(0)}
-          >
-            <StarIcon
-              size={32}
-              color={
-                star <= (hoverRating || userRating)
-                  ? Colors.semanticWarning
-                  : Colors.gray_100
-              }
-              style={styles.starIcon}
-            />
-          </TouchableOpacity>
-        ))}
-      </View>
-    );
-  };
-
-  console.log('Current inventory state:', inventory); // Log para inspeccionar el estado de inventory
-
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
-      <TouchableOpacity>
-        <PoppinsText>Filtrar</PoppinsText>
-        <AdjustmentsHorizontalIcon />
-      </TouchableOpacity>
-      {/* Botón de volver */}
-      <TouchableOpacity
-        onPress={() => navigation.goBack()} // Navega a la pantalla anterior
-        style={{
-          paddingHorizontal: 10,
-          marginBottom: -4,
-          flexDirection: 'row',
-          alignItems: 'center',
-        }}
-      >
-        <ChevronLeftIcon
-          width={16}
-          height={16}
-          color={Colors.primary}
-          style={{ marginRight: 2, marginLeft: 6 }} // Espacio entre el ícono y el texto
-        />
-        <PoppinsText
-          weight="medium"
+      <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
+        <TouchableOpacity
+          style={{ flexDirection: 'row', justifyContent: 'center' }}
+          onPress={() => setIsVisible(true)}
+        >
+          <PoppinsText style={{ color: Colors.primary, paddingEnd: 5 }}>
+            Filtrar
+          </PoppinsText>
+          <AdjustmentsHorizontalIcon size={20} color={Colors.iconMainDefault} />
+        </TouchableOpacity>
+      </View>
+      <View style={{ marginHorizontal: 20 }}>
+        <View style={{ marginVertical: 5 }}>
+          <PoppinsText>Resultados de la búsqueda: {query}</PoppinsText>
+          <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
+            {60} resultados
+          </PoppinsText>
+        </View>
+      </View>
+      <SafeAreaView style={styles.container}></SafeAreaView>
+      <FilterOptions visible={isVisible} onClose={() => setIsVisible(false)}>
+        <View
           style={{
-            fontSize: FontSizes.b1.size,
-            lineHeight: FontSizes.b1.lineHeight,
-            color: Colors.primary,
+            flexDirection: 'row',
+            justifyContent: 'center',
+            paddingVertical: 10,
+            borderBottomWidth: 1,
+            borderColor: Colors.gray_100,
           }}
         >
-          Volver
-        </PoppinsText>
-      </TouchableOpacity>
-      <SafeAreaView style={styles.container}>
-        <ScrollView>
-          {/* Carrusel de imágenes */}
-          <ScrollView
-            ref={imagesScrollRef}
-            horizontal
-            pagingEnabled
-            showsHorizontalScrollIndicator={false}
-            onMomentumScrollEnd={handleScroll}
-          >
-            {product?.images.map((image, index) => (
-              <Image
-                key={index}
-                source={{ uri: image }}
-                style={styles.productImage}
-                resizeMode="contain"
-              />
-            ))}
-          </ScrollView>
-
-          {/* Indicadores de imágenes */}
-          <View style={styles.imageIndicators}>
-            {product?.images.map((_, index) => (
-              <TouchableOpacity
-                key={index}
-                onPress={() => scrollToImage(index)}
-              >
-                <View
-                  style={[
-                    styles.imageIndicator,
-                    index === currentImageIndex && styles.activeImageIndicator,
-                  ]}
-                />
-              </TouchableOpacity>
-            ))}
-          </View>
-
-          <PoppinsText style={styles.productName}>{product?.name}</PoppinsText>
-
-          <RatingStars />
-          {userRating > 0 && (
-            <PoppinsText style={styles.ratingFeedback}>
-              ¡Gracias por tu calificación de {userRating} estrella
-              {userRating !== 1 ? 's' : ''}!
-            </PoppinsText>
-          )}
-
-          <PoppinsText style={styles.description}>
-            {product?.description}
+          <PoppinsText style={{ color: Colors.primary, paddingEnd: 5 }}>
+            Filtros
           </PoppinsText>
-
-          {/* Información del producto */}
-          <View style={styles.productInfo}>
-            <View style={styles.priceRatingContainer}>
-              <PoppinsText style={styles.price}>$ {currentPrice}</PoppinsText>
-              {product?.discount && (
-                <PoppinsText style={styles.discount}>
-                  -{product.discount}%
-                </PoppinsText>
-              )}
-            </View>
-            <PoppinsText style={styles.sectionTitle}>
-              Selecciona la presentación
-            </PoppinsText>
-            <View style={styles.quantitySelector}>
-              <Dropdown
-                placeholder="Presentación..."
-                options={
-                  product?.presentation.map(
-                    (p: { description: string }) => p.description,
-                  ) || []
-                }
-                borderColor={Colors.gray_100}
-                onSelect={(e) => changePresentation(e)}
-              />
-            </View>
-            <PoppinsText
-              style={[
-                styles.sectionTitle,
-                { fontSize: FontSizes.s1.size, paddingTop: 15 },
-              ]}
-            >
-              Disponibilidad en sucursales
-            </PoppinsText>
-            <View style={styles.quantitySelector}>
-              <View style={{ flex: 1, height: 300 }}>
-                {inventory && inventory.length > 0 ? (
-                  <BranchMap
-                    branches={inventory.map((inv) => ({
-                      id: inv.branch.id,
-                      name: inv.branch.name,
-                      address: inv.branch.address,
-                      latitude: inv.branch.latitude,
-                      longitude: inv.branch.longitude,
-                      stockQuantity: inv.stockQuantity,
-                    }))}
-                  />
-                ) : (
-                  <PoppinsText
-                    style={{
-                      textAlign: 'center',
-                      color: Colors.textLowContrast,
-                      marginVertical: 10,
-                    }}
-                  >
-                    No hay productos disponibles
-                  </PoppinsText>
-                )}
-              </View>
-            </View>
-            <PoppinsText style={styles.sectionTitle}>
-              Selecciona el estado
-            </PoppinsText>
-            <View style={styles.quantitySelector}>
-              <Dropdown
-                placeholder="Estado..."
-                options={states.map((state) => state.name)}
-                borderColor={Colors.gray_100}
-                onSelect={() => console.log('p')}
-              />
-            </View>
-            <View style={styles.availableContainer}>
-              {inventory && inventory.length > 0 ? (
-                inventory.map((inv) => (
-                  <View key={inv.id} style={styles.availableCard}>
-                    <View style={{ padding: 10, paddingHorizontal: 16 }}>
-                      <PoppinsText style={styles.sectionTitle}>
-                        {inv.branch.name}
-                      </PoppinsText>
-                      <PoppinsText
-                        style={{
-                          fontSize: FontSizes.b3.size,
-                          color: Colors.textLowContrast,
-                        }}
-                      >
-                        {inv.branch.address}
-                      </PoppinsText>
-                    </View>
-                    <View
-                      style={{
-                        width: '100%',
-                        alignItems: 'flex-end',
-                        paddingHorizontal: 20,
-                      }}
-                    >
-                      <View
-                        style={{ flexDirection: 'row', alignItems: 'center' }}
-                      >
-                        <PoppinsText
-                          style={{
-                            fontSize: FontSizes.c1.size,
-                            color: Colors.textLowContrast,
-                          }}
-                        >
-                          {inv.stockQuantity} unidades{' '}
-                        </PoppinsText>
-                        <CheckCircleIcon
-                          size={15}
-                          color={Colors.semanticSuccess}
-                        />
-                      </View>
-                      <View
-                        style={{ flexDirection: 'row', alignItems: 'center' }}
-                      >
-                        <TruckIcon size={15} color={Colors.gray_500} />
-                        <PoppinsText
-                          style={{
-                            fontSize: FontSizes.c3.size,
-                            color: Colors.gray_500,
-                            marginLeft: 5,
-                          }}
-                        >
-                          Envio en menos de 3h
-                        </PoppinsText>
-                      </View>
-                    </View>
-                  </View>
-                ))
-              ) : (
-                <PoppinsText
-                  style={{
-                    textAlign: 'center',
-                    color: Colors.textLowContrast,
-                    marginVertical: 10,
-                  }}
-                >
-                  No hay productos disponibles
-                </PoppinsText>
-              )}
-            </View>
-            <PoppinsText style={styles.sectionTitle}>
-              Productos relacionados
-            </PoppinsText>
-            <View style={styles.quantitySelector}>
-              <Carousel cards={products} />
+          <AdjustmentsHorizontalIcon size={20} color={Colors.iconMainDefault} />
+        </View>
+        <View style={{ paddingVertical: 10 }}>
+          <View>
+            <PoppinsText weight="medium">Categoría</PoppinsText>
+            <View></View>
+          </View>
+          <View>
+            <PoppinsText weight="medium">Marca o Laboratorio</PoppinsText>
+            <View>
+              {brands?.map((b, index) => (
+                <Checkbox
+                  key={index}
+                  checked={false}
+                  label={b.name}
+                  onChange={(e) => (e ? '' : null)}
+                  style={{ margin: 3 }}
+                  size={20}
+                />
+              ))}
             </View>
           </View>
-        </ScrollView>
-
-        <View style={styles.cardButtonContainer}>
-          <CardButton
-            size={10}
-            getValue={(quantity) => {
-              if (product?.id) updateCartQuantity(product.id, quantity);
-            }}
-            initialValue={getQuantity()}
+          <View>
+            <PoppinsText weight="medium">Presentación</PoppinsText>
+          </View>
+        </View>
+        <View>
+          <PoppinsText weight="medium">Precio</PoppinsText>
+          <Steps
+            totalSteps={2}
+            currentStep={2}
+            labels={['Bs. 40.00', 'Bs. 1000.00']}
           />
+          <Button title="Filtrar" />
         </View>
-      </SafeAreaView>
+      </FilterOptions>
     </View>
   );
 }
diff --git a/src/services/products.ts b/src/services/products.ts
index d10f82a..b4652ee 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -1,10 +1,13 @@
 import { api } from '../lib/sdkConfig';
+import * as SecureStore from 'expo-secure-store';
 import {
   Pagination,
   ProductPresentation,
   GenericProductResponse,
   ProductPresentationResponse,
   ProductImage,
+  ManufacturerResponse,
+  ProductPaginationRequest,
 } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
 import { extractErrorMessage } from '../utils/errorHandler';
@@ -13,11 +16,13 @@ export const ProductService = {
   getProducts: async (
     page: number,
     limit: number,
+    params?: ProductPaginationRequest,
   ): Promise<ServiceResponse<Pagination<ProductPresentation>>> => {
     try {
       const products = await api.product.getProducts({
         page: page,
         limit: limit,
+        ...params,
       });
 
       return { success: true, data: products };
@@ -73,4 +78,25 @@ export const ProductService = {
       };
     }
   },
+
+  getBrands: async (
+    page: number,
+    limit: number,
+  ): Promise<ServiceResponse<Pagination<ManufacturerResponse>>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      const response = await api.manufacturer.findAll({ page, limit }, token);
+
+      return { success: true, data: response };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
 };

From 72748768e2a115258b922592e30605e4a75c4773 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 14:35:51 -0400
Subject: [PATCH 138/291] Delivery history list and details

---
 package-lock.json                             |   8 +-
 package.json                                  |   2 +-
 src/components/HistoryOrderCard.tsx           |  36 ++-
 .../delivery/DeliveryHistoryDetailScreen.tsx  | 150 ++++++++++---
 .../delivery/DeliveryHistoryScreen.tsx        | 206 +++++++++++++-----
 5 files changed, 301 insertions(+), 101 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 08715bd..f6a2bd1 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.7",
+        "@pharmatech/sdk": "^0.4.9",
         "@reduxjs/toolkit": "^2.6.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
@@ -3587,9 +3587,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.7",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.7.tgz",
-      "integrity": "sha512-wpDH3yfDVhDqNsZyaRSAhzGzrS09k6CDuPx4Ys/Yh4NWeNQ9Q412Mnps+tAzjYpW8fd5r3+FvgzRdfMfV/cnng==",
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.9.tgz",
+      "integrity": "sha512-E0UKWSs1R8CEXCxHSqmVFvlNcYg8xcPJrTQVDAUnrMeAIBBVBck4gg9ymXYIAVlbMzhpxoSVBQB5zWreFzNoUw==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 2345778..09de73c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.7",
+    "@pharmatech/sdk": "^0.4.9",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index d53d5e8..e7d67f0 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -7,7 +7,7 @@ import {
 } from 'react-native-heroicons/outline';
 import { CheckCircleIcon } from 'react-native-heroicons/solid';
 import Badge from './Badge';
-import Avatar from './Avatar';
+import CustomerAvatar from './CustomerAvatar';
 import Button from './Button';
 import PoppinsText from './PoppinsText';
 import { Colors, FontSizes } from '../styles/theme';
@@ -35,6 +35,9 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
   userName,
   onViewDetails,
 }) => {
+  // Separar el nombre y apellido del cliente
+  const [firstName, lastName] = userName.split(' ');
+
   return (
     <View style={styles.card}>
       {/* Header */}
@@ -45,15 +48,17 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           size="small"
           borderRadius="square"
         >
-          {`${elapsedTime}, ${completionTime}`}
+          Hace {`${elapsedTime}, ${completionTime}`}
         </Badge>
       </View>
 
       {/* Order Code */}
-      <PoppinsText weight="medium" style={styles.orderCode}>
-        <CheckCircleIcon size={20} color={Colors.semanticSuccess} />{' '}
-        {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
-      </PoppinsText>
+      <View style={styles.orderCodeContainer}>
+        <CheckCircleIcon size={20} color={Colors.semanticSuccess} />
+        <PoppinsText weight="medium" style={styles.orderCodeText}>
+          {orderType === 'pedido' ? 'Orden' : 'Reubicación'} #{orderCode}
+        </PoppinsText>
+      </View>
 
       {/* Details */}
       <View style={styles.details}>
@@ -62,7 +67,11 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           <PoppinsText style={styles.detailText}>{address}</PoppinsText>
         </View>
         <View style={styles.detailRow}>
-          <Avatar scale={20} />
+          <CustomerAvatar
+            firstName={firstName}
+            lastName={lastName}
+            scale={20}
+          />
           <PoppinsText style={styles.detailText}>{userName}</PoppinsText>
         </View>
         <View style={styles.detailRow}>
@@ -73,7 +82,9 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
         </View>
         <View style={styles.detailRow}>
           <ClockIcon size={20} color={Colors.primary} />
-          <PoppinsText style={styles.detailText}>{estimatedTime}</PoppinsText>
+          <PoppinsText style={styles.detailText}>
+            Tiempo de entrega: {estimatedTime}
+          </PoppinsText>
         </View>
       </View>
 
@@ -110,10 +121,15 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     marginBottom: 8,
   },
-  orderCode: {
+  orderCodeContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
+  orderCodeText: {
     fontSize: FontSizes.h5.size,
     color: Colors.primary,
-    marginBottom: 8,
+    marginLeft: 8,
   },
   elapsedTime: {
     fontSize: FontSizes.label.size,
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
index cfcee65..79f0c7c 100644
--- a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -1,33 +1,58 @@
-import React from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
 import { PhoneIcon, EnvelopeIcon } from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
 import PoppinsText from '../../components/PoppinsText';
+import CustomerAvatar from '../../components/CustomerAvatar';
+import DeliveryMap from '../../components/DeliveryMap';
 import { Colors, FontSizes } from '../../styles/theme';
-import Avatar from '../../components/Avatar';
-
-interface Product {
-  id: string;
-  name: string;
-  quantity: number;
-}
+import { DeliveryService } from '../../services/delivery';
+import { BranchService } from '../../services/branches';
+import { OrderDeliveryDetailedResponse, BranchResponse } from '@pharmatech/sdk';
 
 const DeliveryHistoryDetailScreen: React.FC = () => {
-  const { data } = useLocalSearchParams();
-
-  console.log(
-    'Datos recibidos en la pantalla del historial (sin procesar):',
-    data,
+  const { id } = useLocalSearchParams();
+  const [orderDetails, setOrderDetails] =
+    useState<OrderDeliveryDetailedResponse | null>(null);
+  const [branchDetails, setBranchDetails] = useState<BranchResponse | null>(
+    null,
   );
+  const [loading, setLoading] = useState(true);
+  const [deliveryState] = useState(0);
+
+  useEffect(() => {
+    const fetchOrderDetails = async () => {
+      try {
+        if (!id) {
+          throw new Error('ID del pedido no proporcionado');
+        }
 
-  const orderData = data
-    ? JSON.parse(decodeURIComponent(data as string))
-    : null;
+        // Obtener detalles completos del pedido
+        const details = await DeliveryService.getOrderDetails(id as string);
+        setOrderDetails(details);
 
-  console.log('Datos decodificados en la pantalla del historial:', orderData);
+        // Obtener detalles de la sucursal
+        const branches = await BranchService.findAll({ page: 1, limit: 100 });
+        const branch = branches.results.find(
+          (branch) => branch.id === details.branchId,
+        );
+        setBranchDetails(branch || null);
+      } catch (error) {
+        console.error('Error al obtener los detalles del pedido:', error);
+      } finally {
+        setLoading(false);
+      }
+    };
 
-  if (!orderData) {
+    fetchOrderDetails();
+  }, [id]);
+
+  if (loading) {
+    return <ActivityIndicator size="large" color={Colors.primary} />;
+  }
+
+  if (!orderDetails || !branchDetails) {
     return (
       <View style={styles.errorContainer}>
         <PoppinsText style={styles.errorText}>
@@ -37,6 +62,39 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
     );
   }
 
+  const branchLocation = {
+    latitude: branchDetails.latitude,
+    longitude: branchDetails.longitude,
+  };
+
+  const customerLocation = {
+    latitude: orderDetails.address.latitude || 0,
+    longitude: orderDetails.address.longitude || 0,
+  };
+
+  // Calcular tiempos usando la función reutilizada
+  const elapsedTime = calculateElapsedTime(orderDetails.createdAt);
+  const completionTime = new Date(orderDetails.updatedAt).toLocaleTimeString(
+    'es-VE',
+    {
+      hour: '2-digit',
+      minute: '2-digit',
+    },
+  );
+  const creationTime = new Date(orderDetails.createdAt).toLocaleTimeString(
+    'es-VE',
+    {
+      hour: '2-digit',
+      minute: '2-digit',
+    },
+  );
+  const creationTimePlusOneHour = new Date(
+    new Date(orderDetails.createdAt).getTime() + 60 * 43 * 1000,
+  ).toLocaleTimeString('es-VE', {
+    hour: '2-digit',
+    minute: '2-digit',
+  });
+
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <ScrollView contentContainerStyle={styles.container}>
@@ -51,7 +109,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
             size="small"
             borderRadius="square"
           >
-            {`${orderData.elapsedTime}, ${orderData.completionTime}`}
+            Hace {`${elapsedTime}, ${completionTime}`}
           </Badge>
         </View>
 
@@ -60,15 +118,20 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
           {/* Información del cliente */}
           <View style={styles.cardRow}>
             <View style={styles.avatar}>
-              <Avatar />
+              <CustomerAvatar
+                firstName={orderDetails.user.firstName}
+                lastName={orderDetails.user.lastName}
+              />
             </View>
             <PoppinsText weight="medium" style={styles.userName}>
-              {orderData.userName}
+              {orderDetails.user.firstName} {orderDetails.user.lastName}
             </PoppinsText>
           </View>
           <View style={styles.cardRow}>
             <PhoneIcon size={20} color={Colors.primary} style={styles.icon} />
-            <PoppinsText style={styles.cardSubtitle}>+123456789</PoppinsText>
+            <PoppinsText style={styles.cardSubtitle}>
+              {orderDetails.user.phoneNumber || 'Sin teléfono'}
+            </PoppinsText>
           </View>
           <View style={styles.cardRow}>
             <EnvelopeIcon
@@ -97,11 +160,11 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
             <View style={styles.sectionContainer}>
               <View style={styles.cardRow}>
                 <PoppinsText style={styles.cardTitle}>
-                  {orderData.branch}
+                  {branchDetails.name}
                 </PoppinsText>
               </View>
               <PoppinsText style={styles.cardSubtitle}>
-                {orderData.address}
+                {branchDetails.address}
               </PoppinsText>
             </View>
 
@@ -111,7 +174,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
                 <PoppinsText style={styles.cardTitle}>Entrega</PoppinsText>
               </View>
               <PoppinsText style={styles.cardSubtitle}>
-                {orderData.address}
+                {orderDetails.address.adress}
               </PoppinsText>
             </View>
           </View>
@@ -144,7 +207,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
               </View>
               <PoppinsText
                 style={styles.historySubtitle}
-              >{`${orderData.elapsedTime}, ${orderData.completionTime}`}</PoppinsText>
+              >{`${creationTime}`}</PoppinsText>
             </View>
 
             <View style={styles.sectionContainer}>
@@ -154,7 +217,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
                 </PoppinsText>
               </View>
               <PoppinsText style={styles.historySubtitle}>
-                {`${orderData.elapsedTime}`}, hora de recogida
+                {`${creationTimePlusOneHour}`}
               </PoppinsText>
             </View>
 
@@ -163,7 +226,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
                 <PoppinsText style={styles.historyTitle}>Entregado</PoppinsText>
               </View>
               <PoppinsText style={styles.historySubtitle}>
-                {`${orderData.elapsedTime}`}, hora de entrega
+                {`${completionTime}`}
               </PoppinsText>
             </View>
           </View>
@@ -173,9 +236,13 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
         <PoppinsText weight="medium" style={styles.sectionTitle}>
           Recorrido de entrega
         </PoppinsText>
-        <View style={styles.mapPlaceholder} />
+        <DeliveryMap
+          deliveryState={deliveryState}
+          branchLocation={branchLocation}
+          customerLocation={customerLocation}
+        />
 
-        {/* Pedido */}
+        {/* Pedido 
         <PoppinsText weight="medium" style={styles.sectionTitle}>
           Pedido
         </PoppinsText>
@@ -194,13 +261,32 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
               </PoppinsText>
             </View>
           </View>
-        ))}
+        ))}*/}
         <View style={styles.scrollSpacer} />
       </ScrollView>
     </View>
   );
 };
 
+// Función reutilizada para calcular el tiempo transcurrido
+const calculateElapsedTime = (createdAt: string): string => {
+  const now = new Date();
+  const createdDate = new Date(createdAt);
+  const diffInMinutes = Math.floor(
+    (now.getTime() - createdDate.getTime()) / (1000 * 60),
+  );
+
+  if (diffInMinutes < 60) {
+    return `${diffInMinutes} minutos`;
+  } else if (diffInMinutes < 1440) {
+    const hours = Math.floor(diffInMinutes / 60);
+    return `${hours} horas`;
+  } else {
+    const days = Math.floor(diffInMinutes / 1440);
+    return `${days} días`;
+  }
+};
+
 const styles = StyleSheet.create({
   header: {
     flexDirection: 'row',
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 08d6c00..ee639d5 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -1,78 +1,170 @@
-import React from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  RefreshControl,
+} from 'react-native';
+import * as SecureStore from 'expo-secure-store';
 import { useRouter } from 'expo-router';
 import PoppinsText from '../../components/PoppinsText';
 import HistoryOrderCard from '../../components/HistoryOrderCard';
 import { Colors, FontSizes } from '../../styles/theme';
-
-interface Order {
-  id: string;
-  type: 'pedido' | 'reubicación';
-  address: string;
-  branch: string;
-  estimatedTime: string;
-  elapsedTime: string;
-  completionTime: string;
-  userName: string;
-}
+import { DeliveryService } from '../../services/delivery';
+import { BranchService } from '../../services/branches';
+import {
+  OrderDeliveryDetailedResponse,
+  BranchResponse,
+  OrderDeliveryStatus,
+} from '@pharmatech/sdk';
 
 const DeliveryHistoryScreen: React.FC = () => {
   const router = useRouter();
+  const [completedOrders, setCompletedOrders] = useState<
+    OrderDeliveryDetailedResponse[]
+  >([]);
+  const [branchNames, setBranchNames] = useState<Record<string, string>>({});
+  const [loading, setLoading] = useState<boolean>(true);
+  const [refreshing, setRefreshing] = useState<boolean>(false);
+
+  const fetchCompletedOrders = async () => {
+    try {
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+
+      const payload = JSON.parse(atob(jwt.split('.')[1]));
+      const employeeId = payload.sub;
+
+      // Obtener órdenes completadas
+      const response = await DeliveryService.getAssignedOrders(
+        employeeId,
+        OrderDeliveryStatus.DELIVERED,
+      );
 
-  const completedOrders: Array<Order> = [
-    {
-      id: '12345',
-      type: 'pedido',
-      address: 'Av. Principal 123, Ciudad',
-      branch: 'Sucursal Central',
-      estimatedTime: '30 minutos',
-      elapsedTime: 'Hace 2 días',
-      completionTime: '14:30',
-      userName: 'Nombre Usuario',
-    },
-    {
-      id: '67890',
-      type: 'reubicación',
-      address: 'Calle Secundaria 456, Ciudad',
-      branch: 'Sucursal Norte',
-      estimatedTime: '45 minutos',
-      elapsedTime: 'Hace 1 semana',
-      completionTime: '16:45',
-      userName: 'Nombre Usuario',
-    },
-  ];
+      // Obtener detalles de las órdenes
+      const detailedOrders = await Promise.all(
+        response.results.map(async (order) => {
+          const details = await DeliveryService.getOrderDetails(order.id);
+          return details;
+        }),
+      );
 
-  const handleViewDetails = (order: Order) => {
-    console.log('Datos enviados al detalle del historial:', order);
+      // Obtener nombres de sucursales
+      const branchIds = [
+        ...new Set(detailedOrders.map((order) => order.branchId)),
+      ];
+      const branches = await BranchService.findAll({ page: 1, limit: 100 });
+      const branchMap = branches.results.reduce(
+        (acc: Record<string, string>, branch: BranchResponse) => {
+          if (branchIds.includes(branch.id)) {
+            acc[branch.id] = branch.name;
+          }
+          return acc;
+        },
+        {},
+      );
+
+      setBranchNames(branchMap);
+      setCompletedOrders(detailedOrders);
+    } catch (error) {
+      console.error('Error al obtener el historial de pedidos:', error);
+    } finally {
+      setLoading(false);
+      setRefreshing(false);
+    }
+  };
+
+  const handleViewDetails = (order: OrderDeliveryDetailedResponse) => {
     const query = encodeURIComponent(JSON.stringify(order));
     router.push(`/deliveryHistoryDetail/${order.id}?data=${query}`);
   };
 
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchCompletedOrders();
+  };
+
+  useEffect(() => {
+    fetchCompletedOrders();
+  }, []);
+
   return (
     <View style={styles.container}>
-      <PoppinsText style={styles.title} weight="regular">
-        Historial de Pedidos
-      </PoppinsText>
-      <ScrollView showsVerticalScrollIndicator={false}>
-        {completedOrders.map((order) => (
-          <HistoryOrderCard
-            key={order.id}
-            orderCode={order.id}
-            orderType={order.type}
-            address={order.address}
-            branch={order.branch}
-            estimatedTime={order.estimatedTime}
-            elapsedTime={order.elapsedTime}
-            completionTime={order.completionTime}
-            userName={order.userName}
-            onViewDetails={() => handleViewDetails(order)}
+      <ScrollView
+        showsVerticalScrollIndicator={false}
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={[Colors.primary]}
           />
-        ))}
+        }
+      >
+        <PoppinsText style={styles.title} weight="regular">
+          Historial de Pedidos
+        </PoppinsText>
+        {loading ? (
+          <ActivityIndicator size="large" color={Colors.primary} />
+        ) : completedOrders.length === 0 ? (
+          <PoppinsText style={styles.noOrdersText}>
+            No tienes pedidos completados.
+          </PoppinsText>
+        ) : (
+          completedOrders.map((order) => (
+            <HistoryOrderCard
+              key={order.id}
+              orderCode={order.id.split('-')[0]} // Mostrar solo los primeros 8 caracteres
+              orderType="pedido"
+              address={order.address?.adress || 'Dirección no disponible'}
+              branch={branchNames[order.branchId] || 'Sucursal no disponible'}
+              estimatedTime={new Date(order.estimatedTime).toLocaleTimeString(
+                'es-VE',
+                {
+                  hour: '2-digit',
+                  minute: '2-digit',
+                },
+              )}
+              elapsedTime={calculateElapsedTime(order.createdAt)}
+              completionTime={new Date(order.updatedAt).toLocaleTimeString(
+                'es-VE',
+                {
+                  hour: '2-digit',
+                  minute: '2-digit',
+                },
+              )}
+              userName={`${order.user?.firstName || 'Usuario'} ${
+                order.user?.lastName || ''
+              }`}
+              onViewDetails={() => handleViewDetails(order)}
+            />
+          ))
+        )}
       </ScrollView>
     </View>
   );
 };
 
+const calculateElapsedTime = (createdAt: string): string => {
+  const now = new Date();
+  const createdDate = new Date(createdAt);
+  const diffInMinutes = Math.floor(
+    (now.getTime() - createdDate.getTime()) / (1000 * 60),
+  );
+
+  if (diffInMinutes < 60) {
+    return `${diffInMinutes} minutos`;
+  } else if (diffInMinutes < 1440) {
+    const hours = Math.floor(diffInMinutes / 60);
+    return `${hours} horas`;
+  } else {
+    const days = Math.floor(diffInMinutes / 1440);
+    return `${days} días`;
+  }
+};
+
 const styles = StyleSheet.create({
   container: {
     flex: 1,
@@ -86,6 +178,12 @@ const styles = StyleSheet.create({
     color: Colors.textMain,
     marginBottom: 16,
   },
+  noOrdersText: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textLowContrast,
+    textAlign: 'center',
+    marginTop: 16,
+  },
 });
 
 export default DeliveryHistoryScreen;

From cb16e9ea1d88bc3c2cfa741b4714b6388caeddd2 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 15:37:07 -0400
Subject: [PATCH 139/291] Adapting user.ts to latest sdk and implementing
 profile picture to customer avatar

---
 src/components/CustomerAvatar.tsx             | 47 +++++++++++++------
 src/components/HistoryOrderCard.tsx           |  3 ++
 src/screens/delivery/DeliveryDetailScreen.tsx |  1 +
 .../delivery/DeliveryHistoryDetailScreen.tsx  |  1 +
 .../delivery/DeliveryHistoryScreen.tsx        |  1 +
 src/services/user.ts                          | 22 ++++++---
 6 files changed, 55 insertions(+), 20 deletions(-)

diff --git a/src/components/CustomerAvatar.tsx b/src/components/CustomerAvatar.tsx
index f71a2ee..5710657 100644
--- a/src/components/CustomerAvatar.tsx
+++ b/src/components/CustomerAvatar.tsx
@@ -1,17 +1,19 @@
 import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import { View, StyleSheet, Image } from 'react-native';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
 
 type CustomerAvatarProps = {
   firstName: string;
   lastName: string;
+  profilePicture?: string; // Nueva propiedad para la imagen de perfil
   scale?: number; // Propiedad opcional para definir el tamaño del avatar
 };
 
 const CustomerAvatar: React.FC<CustomerAvatarProps> = ({
   firstName,
   lastName,
+  profilePicture,
   scale = 32,
 }) => {
   const getInitials = (firstName: string, lastName: string): string => {
@@ -37,19 +39,33 @@ const CustomerAvatar: React.FC<CustomerAvatarProps> = ({
         },
       ]}
     >
-      <PoppinsText
-        style={[
-          styles.initials,
-          {
-            fontSize: fontSize,
-            lineHeight: lineHeight,
-            marginTop: marginTop,
-          },
-        ]}
-        weight="semibold"
-      >
-        {initials}
-      </PoppinsText>
+      {profilePicture ? (
+        <Image
+          source={{ uri: profilePicture }}
+          style={[
+            styles.avatarImage,
+            {
+              width: avatarSize,
+              height: avatarSize,
+              borderRadius: avatarSize / 2,
+            },
+          ]}
+        />
+      ) : (
+        <PoppinsText
+          style={[
+            styles.initials,
+            {
+              fontSize: fontSize,
+              lineHeight: lineHeight,
+              marginTop: marginTop,
+            },
+          ]}
+          weight="semibold"
+        >
+          {initials}
+        </PoppinsText>
+      )}
     </View>
   );
 };
@@ -60,6 +76,9 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     justifyContent: 'center',
   },
+  avatarImage: {
+    resizeMode: 'cover',
+  },
   initials: {
     color: Colors.textWhite,
     textAlign: 'center',
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index e7d67f0..e52e37e 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -21,6 +21,7 @@ interface HistoryOrderCardProps {
   elapsedTime: string;
   completionTime: string;
   userName: string;
+  profilePicture?: string; // Nueva propiedad para la imagen de perfil
   onViewDetails: () => void;
 }
 
@@ -33,6 +34,7 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
   elapsedTime,
   completionTime,
   userName,
+  profilePicture,
   onViewDetails,
 }) => {
   // Separar el nombre y apellido del cliente
@@ -70,6 +72,7 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           <CustomerAvatar
             firstName={firstName}
             lastName={lastName}
+            profilePicture={profilePicture} // Pasar la imagen de perfil
             scale={20}
           />
           <PoppinsText style={styles.detailText}>{userName}</PoppinsText>
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index dea6503..a0e6cba 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -261,6 +261,7 @@ const DeliveryDetailScreen: React.FC = () => {
               <CustomerAvatar
                 firstName={orderDetails.user.firstName}
                 lastName={orderDetails.user.lastName}
+                profilePicture={orderDetails.user.profilePicture}
                 scale={20}
               />
             </View>
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
index 79f0c7c..4bde0a1 100644
--- a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -121,6 +121,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
               <CustomerAvatar
                 firstName={orderDetails.user.firstName}
                 lastName={orderDetails.user.lastName}
+                profilePicture={orderDetails.user.profilePicture} // Pasar la imagen de perfil
               />
             </View>
             <PoppinsText weight="medium" style={styles.userName}>
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index ee639d5..63bf2cd 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -138,6 +138,7 @@ const DeliveryHistoryScreen: React.FC = () => {
               userName={`${order.user?.firstName || 'Usuario'} ${
                 order.user?.lastName || ''
               }`}
+              profilePicture={order.user?.profilePicture}
               onViewDetails={() => handleViewDetails(order)}
             />
           ))
diff --git a/src/services/user.ts b/src/services/user.ts
index a4cf7cb..a1a0a65 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -233,11 +233,14 @@ export const UserService = {
       }
 
       const userId = decoded.userId;
-      const response = await api.order.findAll({
-        page: 1,
-        limit: 10,
-        userId: userId,
-      });
+      const response = await api.order.findAll(
+        {
+          page: 1,
+          limit: 10,
+          userId: userId,
+        },
+        token, // Proporciona el token JWT como segundo argumento
+      );
       return { success: true, data: response };
     } catch (error) {
       return {
@@ -251,7 +254,14 @@ export const UserService = {
     id: string,
   ): Promise<ServiceResponse<OrderDetailedResponse>> => {
     try {
-      const response = await api.order.getById(id);
+      // Obtén el token JWT desde SecureStore
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      // Llama al método `getById` del SDK con el id y el token JWT
+      const response = await api.order.getById(id, token); // Proporciona el token JWT como segundo argumento
       return { success: true, data: response };
     } catch (error) {
       return {

From cf55e139a2f2e2561f93e0b537e824c5ac36a4d7 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 16:50:27 -0400
Subject: [PATCH 140/291] Adapting to new key and refactoring delivery maps

---
 src/components/DeliveryMap.tsx                |  52 ++++-
 src/components/HistoryMap.tsx                 | 185 ++++++++++++++++++
 src/screens/SelectLocationScreen.tsx          |   2 +-
 src/screens/delivery/DeliveryDetailScreen.tsx |   9 +-
 .../delivery/DeliveryHistoryDetailScreen.tsx  |  32 ++-
 5 files changed, 255 insertions(+), 25 deletions(-)
 create mode 100644 src/components/HistoryMap.tsx

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index de119ef..a83f6df 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -10,9 +10,9 @@ interface DeliveryMapProps {
 }
 
 const DeliveryMap: React.FC<DeliveryMapProps> = ({
-  //deliveryState,
+  deliveryState,
   branchLocation,
-  //customerLocation,
+  customerLocation,
 }) => {
   const [deliveryLocation, setDeliveryLocation] = useState<{
     latitude: number;
@@ -21,6 +21,9 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   const [routeCoordinates, setRouteCoordinates] = useState<
     { latitude: number; longitude: number }[]
   >([]);
+  const [customerRouteCoordinates, setCustomerRouteCoordinates] = useState<
+    { latitude: number; longitude: number }[]
+  >([]);
 
   // Solicitar permisos y obtener la ubicación del delivery
   useEffect(() => {
@@ -51,6 +54,7 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           location.coords.longitude,
           branchLocation.latitude,
           branchLocation.longitude,
+          setRouteCoordinates,
         );
       } catch (error) {
         console.error('Error al obtener la ubicación del delivery:', error);
@@ -70,16 +74,19 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     originLng: number,
     destLat: number,
     destLng: number,
+    setRoute: React.Dispatch<
+      React.SetStateAction<{ latitude: number; longitude: number }[]>
+    >,
   ) => {
     try {
       const response = await fetch(
-        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU`,
+        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
       );
       const data = await response.json();
 
       if (data.routes && data.routes.length > 0) {
         const points = decodePolyline(data.routes[0].overview_polyline.points);
-        setRouteCoordinates(points);
+        setRoute(points);
       } else {
         console.error('No se pudo obtener la ruta.');
       }
@@ -88,6 +95,25 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     }
   };
 
+  // Obtener la ruta hacia el cliente cuando el estado sea el correspondiente
+  useEffect(() => {
+    if (
+      deliveryState >= 3 && // Estado "Ir a destino de entrega" o posterior
+      deliveryLocation
+    ) {
+      fetchRoute(
+        deliveryLocation.latitude,
+        deliveryLocation.longitude,
+        customerLocation.latitude,
+        customerLocation.longitude,
+        setCustomerRouteCoordinates,
+      );
+
+      // Limpiar la ruta hacia la sucursal
+      setRouteCoordinates([]);
+    }
+  }, [deliveryState, deliveryLocation]);
+
   // Decodificar la polyline de Google Maps
   const decodePolyline = (encoded: string) => {
     const points: { latitude: number; longitude: number }[] = [];
@@ -154,7 +180,14 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           pinColor="blue"
         />
 
-        {/* Mostrar la ruta */}
+        {/* Mostrar la ubicación del cliente */}
+        <Marker
+          coordinate={customerLocation}
+          title="Ubicación del cliente"
+          pinColor="green"
+        />
+
+        {/* Mostrar la ruta hacia la sucursal */}
         {routeCoordinates.length > 0 && (
           <Polyline
             coordinates={routeCoordinates}
@@ -162,6 +195,15 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
             strokeWidth={4}
           />
         )}
+
+        {/* Mostrar la ruta hacia el cliente solo si el estado es el correspondiente */}
+        {deliveryState >= 3 && customerRouteCoordinates.length > 0 && (
+          <Polyline
+            coordinates={customerRouteCoordinates}
+            strokeColor="green"
+            strokeWidth={4}
+          />
+        )}
       </MapView>
     </View>
   );
diff --git a/src/components/HistoryMap.tsx b/src/components/HistoryMap.tsx
new file mode 100644
index 0000000..ca16d8d
--- /dev/null
+++ b/src/components/HistoryMap.tsx
@@ -0,0 +1,185 @@
+import React, { useEffect, useState } from 'react';
+import MapView, { Marker, Polyline } from 'react-native-maps';
+import { StyleSheet, View, Alert } from 'react-native';
+
+interface HistoryMapProps {
+  deliveryLocation: { latitude: number; longitude: number };
+  branchLocation: { latitude: number; longitude: number };
+  customerLocation: { latitude: number; longitude: number };
+}
+
+const HistoryMap: React.FC<HistoryMapProps> = ({
+  deliveryLocation,
+  branchLocation,
+  customerLocation,
+}) => {
+  const [routeToBranch, setRouteToBranch] = useState<
+    { latitude: number; longitude: number }[]
+  >([]);
+  const [routeToCustomer, setRouteToCustomer] = useState<
+    { latitude: number; longitude: number }[]
+  >([]);
+
+  // Obtener las rutas al cargar el componente
+  useEffect(() => {
+    const fetchRoutes = async () => {
+      try {
+        // Ruta desde el delivery hasta la sucursal
+        await fetchRoute(
+          deliveryLocation.latitude,
+          deliveryLocation.longitude,
+          branchLocation.latitude,
+          branchLocation.longitude,
+          setRouteToBranch,
+        );
+
+        // Ruta desde la sucursal hasta el cliente
+        await fetchRoute(
+          branchLocation.latitude,
+          branchLocation.longitude,
+          customerLocation.latitude,
+          customerLocation.longitude,
+          setRouteToCustomer,
+        );
+      } catch (error) {
+        console.error('Error al obtener las rutas:', error);
+        Alert.alert('Error', 'Hubo un problema al obtener las rutas.');
+      }
+    };
+
+    fetchRoutes();
+  }, [deliveryLocation, branchLocation, customerLocation]);
+
+  // Obtener la ruta desde Google Maps Directions API
+  const fetchRoute = async (
+    originLat: number,
+    originLng: number,
+    destLat: number,
+    destLng: number,
+    setRoute: React.Dispatch<
+      React.SetStateAction<{ latitude: number; longitude: number }[]>
+    >,
+  ) => {
+    try {
+      const response = await fetch(
+        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
+      );
+      const data = await response.json();
+
+      if (data.routes && data.routes.length > 0) {
+        const points = decodePolyline(data.routes[0].overview_polyline.points);
+        setRoute(points);
+      } else {
+        console.error('No se pudo obtener la ruta.');
+      }
+    } catch (error) {
+      console.error('Error al obtener la ruta:', error);
+    }
+  };
+
+  // Decodificar la polyline de Google Maps
+  const decodePolyline = (encoded: string) => {
+    const points: { latitude: number; longitude: number }[] = [];
+    let index = 0;
+    const len = encoded.length;
+    let lat = 0,
+      lng = 0;
+
+    while (index < len) {
+      let b,
+        shift = 0,
+        result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlat = result & 1 ? ~(result >> 1) : result >> 1;
+      lat += dlat;
+
+      shift = 0;
+      result = 0;
+      do {
+        b = encoded.charCodeAt(index++) - 63;
+        result |= (b & 0x1f) << shift;
+        shift += 5;
+      } while (b >= 0x20);
+      const dlng = result & 1 ? ~(result >> 1) : result >> 1;
+      lng += dlng;
+
+      points.push({
+        latitude: lat / 1e5,
+        longitude: lng / 1e5,
+      });
+    }
+
+    return points;
+  };
+
+  return (
+    <View style={styles.container}>
+      <MapView
+        style={styles.map}
+        initialRegion={{
+          latitude: branchLocation.latitude,
+          longitude: branchLocation.longitude,
+          latitudeDelta: 0.05,
+          longitudeDelta: 0.05,
+        }}
+      >
+        {/* Mostrar la ubicación del delivery */}
+        <Marker
+          coordinate={deliveryLocation}
+          title="Ubicación inicial del delivery"
+          pinColor="red"
+        />
+
+        {/* Mostrar la ubicación de la sucursal */}
+        <Marker
+          coordinate={branchLocation}
+          title="Sucursal de origen"
+          pinColor="blue"
+        />
+
+        {/* Mostrar la ubicación del cliente */}
+        <Marker
+          coordinate={customerLocation}
+          title="Ubicación del cliente"
+          pinColor="green"
+        />
+
+        {/* Mostrar la ruta hacia la sucursal */}
+        {routeToBranch.length > 0 && (
+          <Polyline
+            coordinates={routeToBranch}
+            strokeColor="blue"
+            strokeWidth={4}
+          />
+        )}
+
+        {/* Mostrar la ruta hacia el cliente */}
+        {routeToCustomer.length > 0 && (
+          <Polyline
+            coordinates={routeToCustomer}
+            strokeColor="green"
+            strokeWidth={4}
+          />
+        )}
+      </MapView>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    height: 300,
+    borderRadius: 16,
+    overflow: 'hidden',
+    marginBottom: 16,
+  },
+  map: {
+    flex: 1,
+  },
+});
+
+export default HistoryMap;
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index cbe3329..487a3e7 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -76,7 +76,7 @@ const SelectLocationScreen = () => {
   const fetchAddress = async (latitude: number, longitude: number) => {
     try {
       const response = await fetch(
-        `https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&key=AIzaSyDo6tMJUrZsd-LsNNnUDJ95ZGZfUrYMmgU`,
+        `https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
       );
       const data = await response.json();
 
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index a0e6cba..e638177 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -53,8 +53,8 @@ const DeliveryDetailScreen: React.FC = () => {
   };
 
   const customerLocation = {
-    latitude: 0,
-    longitude: 0,
+    latitude: orderDetails?.address?.latitude || 0,
+    longitude: orderDetails?.address?.longitude || 0,
   };
 
   useEffect(() => {
@@ -66,6 +66,11 @@ const DeliveryDetailScreen: React.FC = () => {
 
         setOrderDetails(details);
 
+        // Validar si las coordenadas del cliente están disponibles
+        if (!details.address.latitude || !details.address.longitude) {
+          console.warn('Las coordenadas del cliente no están disponibles.');
+        }
+
         // Obtener todas las sucursales y mapear sus nombres y coordenadas
         const branches = await BranchService.findAll({ page: 1, limit: 100 });
         const branchMap = branches.results.reduce(
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
index 4bde0a1..1512cda 100644
--- a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -5,7 +5,7 @@ import { PhoneIcon, EnvelopeIcon } from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
 import PoppinsText from '../../components/PoppinsText';
 import CustomerAvatar from '../../components/CustomerAvatar';
-import DeliveryMap from '../../components/DeliveryMap';
+import HistoryMap from '../../components/HistoryMap';
 import { Colors, FontSizes } from '../../styles/theme';
 import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
@@ -19,7 +19,6 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
     null,
   );
   const [loading, setLoading] = useState(true);
-  const [deliveryState] = useState(0);
 
   useEffect(() => {
     const fetchOrderDetails = async () => {
@@ -62,16 +61,6 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
     );
   }
 
-  const branchLocation = {
-    latitude: branchDetails.latitude,
-    longitude: branchDetails.longitude,
-  };
-
-  const customerLocation = {
-    latitude: orderDetails.address.latitude || 0,
-    longitude: orderDetails.address.longitude || 0,
-  };
-
   // Calcular tiempos usando la función reutilizada
   const elapsedTime = calculateElapsedTime(orderDetails.createdAt);
   const completionTime = new Date(orderDetails.updatedAt).toLocaleTimeString(
@@ -141,7 +130,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
               style={styles.icon}
             />
             <PoppinsText style={styles.cardSubtitle}>
-              cliente@correo.com
+              {orderDetails.user.email || 'Sin correo'}
             </PoppinsText>
           </View>
 
@@ -237,10 +226,19 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
         <PoppinsText weight="medium" style={styles.sectionTitle}>
           Recorrido de entrega
         </PoppinsText>
-        <DeliveryMap
-          deliveryState={deliveryState}
-          branchLocation={branchLocation}
-          customerLocation={customerLocation}
+        <HistoryMap
+          deliveryLocation={{
+            latitude: 10.068522,
+            longitude: -69.282318,
+          }}
+          branchLocation={{
+            latitude: branchDetails.latitude,
+            longitude: branchDetails.longitude,
+          }}
+          customerLocation={{
+            latitude: orderDetails.address.latitude,
+            longitude: orderDetails.address.longitude,
+          }}
         />
 
         {/* Pedido 

From bb627f8b51f0af8048297271c71fb3de668acf03 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 19:46:26 -0400
Subject: [PATCH 141/291] Checkout navigation and design fixes

---
 src/app/_layout.tsx                   |  5 +-
 src/components/Dropdown.tsx           | 48 +++++++++++--------
 src/screens/CheckoutScreen.tsx        | 69 ++++++++++++++++++++++-----
 src/screens/DirectionCreateScreen.tsx |  3 +-
 src/screens/ProductDetailScreen.tsx   | 13 +++--
 5 files changed, 95 insertions(+), 43 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 97d2ba2..3253525 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -68,10 +68,7 @@ export default function RootLayout() {
         <Stack.Screen name="login" options={{ headerShown: false }} />
         <Stack.Screen name="splash" options={{ headerShown: false }} />
         <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen
-          name="products/[productId]/presentation"
-          options={{ headerShown: false }}
-        />
+        <Stack.Screen name="products" options={{ headerShown: false }} />
         <Stack.Screen
           name="profile"
           options={{ headerTitle: '', headerTransparent: true }}
diff --git a/src/components/Dropdown.tsx b/src/components/Dropdown.tsx
index a262a92..054a78d 100644
--- a/src/components/Dropdown.tsx
+++ b/src/components/Dropdown.tsx
@@ -2,8 +2,8 @@ import React, { useState } from 'react';
 import {
   View,
   TouchableOpacity,
-  TouchableHighlight,
   StyleSheet,
+  TouchableWithoutFeedback, // Importa TouchableWithoutFeedback
 } from 'react-native';
 import { ChevronDownIcon } from 'react-native-heroicons/outline';
 import PoppinsText from './PoppinsText';
@@ -34,7 +34,9 @@ const Dropdown: React.FC<DropdownProps> = ({
   const handleSelect = (option: string) => {
     setSelectedOption(option);
     onSelect(option);
-    setIsOpen(false);
+    setTimeout(() => {
+      setIsOpen(false);
+    }, 150); // Retraso de 200ms antes de cerrar el menú
   };
 
   const getBorderWidth = () => {
@@ -66,28 +68,36 @@ const Dropdown: React.FC<DropdownProps> = ({
       {isOpen && (
         <View style={[styles.optionsContainer]}>
           {options.map((option, index) => (
-            <TouchableHighlight
+            <TouchableWithoutFeedback
               key={index}
-              onPress={() => handleSelect(option)}
-              style={[
-                {
-                  backgroundColor:
-                    option === selectedOption ? Colors.primary : '',
-                },
-                styles.option,
-              ]}
-              activeOpacity={1}
-              underlayColor={Colors.primary}
+              onPress={() => handleSelect(option)} // Selecciona la opción al presionar
             >
-              <PoppinsText
+              <View
                 style={[
-                  { color: option === selectedOption ? Colors.textWhite : '' },
-                  styles.optionText,
+                  {
+                    backgroundColor:
+                      option === selectedOption
+                        ? Colors.primary
+                        : Colors.textWhite, // Solo cambia el fondo si está seleccionado
+                  },
+                  styles.option,
                 ]}
               >
-                {option}
-              </PoppinsText>
-            </TouchableHighlight>
+                <PoppinsText
+                  style={[
+                    {
+                      color:
+                        option === selectedOption
+                          ? Colors.textWhite
+                          : Colors.textLowContrast, // Cambia el color del texto solo si está seleccionado
+                    },
+                    styles.optionText,
+                  ]}
+                >
+                  {option}
+                </PoppinsText>
+              </View>
+            </TouchableWithoutFeedback>
           ))}
         </View>
       )}
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 09acd13..20c78a0 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,5 +1,11 @@
-import React, { useState } from 'react';
-import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  TouchableOpacity,
+  Animated,
+} from 'react-native';
 import {
   ShoppingBagIcon,
   TruckIcon,
@@ -20,11 +26,15 @@ import Coupon from '../components/Coupon';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
+import { UserService } from '../services/user';
 import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
+import { useDispatch } from 'react-redux';
+import { clearCart } from '../redux/slices/cartSlice';
 
 const CheckoutScreen = () => {
   const router = useRouter();
+  const dispatch = useDispatch();
   const { cartItems } = useCart();
   const [selectedOption, setSelectedOption] = useState<
     'pickup' | 'delivery' | null
@@ -39,13 +49,31 @@ const CheckoutScreen = () => {
   const [couponDiscount, setCouponDiscount] = useState(0);
   const [isCouponApplied, setIsCouponApplied] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [userName] = useState<string | null>('Usuario');
+  const [userName, setUserName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<{
     name: string;
     latitude: number;
     longitude: number;
   } | null>(null);
+  const [orderNumber, setOrderNumber] = useState<string | null>(null);
+
+  useEffect(() => {
+    const fetchUserName = async () => {
+      const response = await UserService.getProfile();
+      if (response.success && response.data) {
+        const { firstName } = response.data; // Solo obtenemos el primer nombre
+        setUserName(firstName);
+      } else if (!response.success) {
+        console.error(
+          'Error al obtener el nombre del usuario:',
+          response.error,
+        );
+      }
+    };
+
+    fetchUserName();
+  }, []);
 
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
@@ -168,8 +196,14 @@ const CheckoutScreen = () => {
             return;
           }
 
+          // Guardar el número de orden generado
+          setOrderNumber(orderResponse.id);
+
           console.log('Orden creada exitosamente:', orderResponse);
 
+          // Limpiar el carrito
+          dispatch(clearCart());
+
           setStatus('approved');
           setCurrentStep(stepsLabels.length);
         } catch (error) {
@@ -184,6 +218,11 @@ const CheckoutScreen = () => {
   };
 
   const handleGoBack = () => {
+    if (currentStep === stepsLabels.length) {
+      // Si estamos en el último paso, no permitir retroceder
+      return;
+    }
+
     if (currentStep === 1) {
       router.back();
     } else if (currentStep > 1) {
@@ -192,6 +231,7 @@ const CheckoutScreen = () => {
   };
 
   const handleGoToHome = () => {
+    router.dismissAll();
     router.replace({
       pathname: '/(tabs)',
     });
@@ -288,16 +328,20 @@ const CheckoutScreen = () => {
   return (
     <ScrollView contentContainerStyle={styles.scrollContainer}>
       <View style={styles.container}>
-        <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-          <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
-        </TouchableOpacity>
+        {currentStep < stepsLabels.length && (
+          <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
+            <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
+          </TouchableOpacity>
+        )}
 
         <View style={styles.steps}>
-          <Steps
-            totalSteps={stepsLabels.length}
-            currentStep={currentStep}
-            labels={stepsLabels}
-          />
+          <Animated.View style={{ opacity: 1 }}>
+            <Steps
+              totalSteps={stepsLabels.length}
+              currentStep={currentStep}
+              labels={stepsLabels}
+            />
+          </Animated.View>
         </View>
 
         {errorMessage && (
@@ -385,7 +429,7 @@ const CheckoutScreen = () => {
             </PoppinsText>
             <PaymentStatusMessage
               status={status}
-              orderNumber={'N/A'}
+              orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
               userName={userName || 'Usuario'}
             />
             <View style={styles.confirmationContainer}>
@@ -488,6 +532,7 @@ const styles = StyleSheet.create({
     marginTop: 60,
   },
   purchaseOptionsTitle: {
+    paddingVertical: 16,
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
     marginBottom: 30,
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index 847ab4f..f932cc8 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -100,7 +100,8 @@ const DirectionCreateScreen = () => {
         setShowSuccessAlert(true);
         setTimeout(() => {
           if (fromCheckout === 'true') {
-            router.push('/checkout');
+            router.dismiss(2);
+            router.replace('/checkout');
           } else {
             router.replace('/direction');
           }
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 9ad5955..391d8ce 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -9,6 +9,7 @@ import {
   Dimensions,
   NativeSyntheticEvent,
   NativeScrollEvent,
+  ActivityIndicator,
 } from 'react-native';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
@@ -316,13 +317,11 @@ const ProductDetailScreen: React.FC = () => {
           </View>
 
           <PoppinsText style={styles.productName}>
-            {product?.product.name +
-              ' ' +
-              product?.presentation.name +
-              ' ' +
-              product?.presentation.quantity +
-              ' ' +
-              product?.presentation.measurementUnit}
+            {product ? (
+              `${product.product.name} ${product.presentation.name} ${product.presentation.quantity} ${product.presentation.measurementUnit}`
+            ) : (
+              <ActivityIndicator size="small" color={Colors.primary} />
+            )}
           </PoppinsText>
 
           <RatingStars />

From f42ba2d476bda68cfaf051896f5fa3a13cee9a97 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 22 Apr 2025 21:14:23 -0400
Subject: [PATCH 142/291] Added categories screen

---
 src/assets/images/defaults/category.png | Bin 0 -> 32687 bytes
 src/screens/tab/CategoriesScreen.tsx    | 103 ++++++++++++++++++++++--
 2 files changed, 97 insertions(+), 6 deletions(-)
 create mode 100644 src/assets/images/defaults/category.png

diff --git a/src/assets/images/defaults/category.png b/src/assets/images/defaults/category.png
new file mode 100644
index 0000000000000000000000000000000000000000..ddecb4752e700e9dadf33113e27b034046d9cce9
GIT binary patch
literal 32687
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

literal 0
HcmV?d00001

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index e80332d..d688b2b 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -1,30 +1,121 @@
-import React, { useEffect } from 'react';
-import { View, StyleSheet } from 'react-native';
+import React, { useEffect, useState } from 'react';
+import {
+  View,
+  StyleSheet,
+  FlatList,
+  TouchableOpacity,
+  ActivityIndicator,
+  Image,
+  ListRenderItem,
+} from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
+import Alert from '../../components/Alerts';
 import { CategoryService } from '../../services/category';
+import { CategoryResponse } from '@pharmatech/sdk';
+import CategoryDefaultImg from '../../assets/images/defaults/category.png';
 
 export default function CategoriesScreen() {
+  const [categories, setCategories] = useState<CategoryResponse[]>([]);
+  const [loading, setLoading] = useState(true);
+  const [errorMessage, setErrorMessage] = useState('');
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+
   useEffect(() => {
     const fetchCategories = async () => {
-      const categories = await CategoryService.getCategories(1, 100);
-      if (categories.success) {
-        console.log(categories.data);
+      setLoading(true);
+      try {
+        const categories = await CategoryService.getCategories(1, 100);
+        if (categories.success) setCategories(categories.data.results);
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ocurrio un error');
       }
+      setLoading(false);
     };
 
     fetchCategories();
   }, []);
 
+  const renderItem: ListRenderItem<CategoryResponse> = ({ item }) => (
+    <TouchableOpacity
+      style={styles.gridItem}
+      onPress={() => console.log('Category selected:', item)}
+    >
+      <Image source={CategoryDefaultImg} />
+      <PoppinsText style={styles.categoryText}>{item.name}</PoppinsText>
+    </TouchableOpacity>
+  );
+
+  if (loading) {
+    return (
+      <View style={styles.center}>
+        <ActivityIndicator size="large" />
+      </View>
+    );
+  }
+
   return (
     <View style={styles.container}>
-      <PoppinsText>Pantalla Categorías</PoppinsText>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+      </View>
+      <FlatList
+        data={categories}
+        renderItem={renderItem}
+        keyExtractor={(item) => item.id.toString()}
+        numColumns={2}
+        contentContainerStyle={styles.listContainer}
+        showsVerticalScrollIndicator={true}
+        alwaysBounceVertical={true}
+      />
     </View>
   );
 }
 
 const styles = StyleSheet.create({
   container: {
+    backgroundColor: Colors.bgColor,
+    flex: 1,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  listContainer: {
+    marginHorizontal: 10,
+  },
+  gridItem: {
+    flex: 1,
+    margin: 10,
+    maxWidth: 150,
+    padding: 15,
+    borderRadius: 15,
+    backgroundColor: Colors.textWhite,
+    justifyContent: 'flex-end',
+    alignItems: 'center',
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+  },
+  categoryText: {
+    marginTop: 10,
+    fontWeight: 'bold',
+    textAlign: 'center',
+  },
+  center: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',

From 4710186620b724a6d2867cf1ebf5c8b76107a39a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 21:21:21 -0400
Subject: [PATCH 143/291] Moving delivery flow access to menu screen and
 adpting to latest sdk

---
 src/components/TopBarDelivery.tsx  |  4 ++-
 src/screens/CheckoutScreen.tsx     | 24 +++++++++++++--
 src/screens/MenuScreen.tsx         | 41 ++++++++++++++++++++++----
 src/screens/tab/OffersScreen.tsx   | 47 ++----------------------------
 src/services/paymentInformation.ts | 12 ++++----
 5 files changed, 68 insertions(+), 60 deletions(-)

diff --git a/src/components/TopBarDelivery.tsx b/src/components/TopBarDelivery.tsx
index 0591771..23ebe4b 100644
--- a/src/components/TopBarDelivery.tsx
+++ b/src/components/TopBarDelivery.tsx
@@ -42,7 +42,9 @@ const TopBarDelivery = () => {
       <View style={styles.topSection}>
         {/* Left user icon */}
         <View>
-          <TouchableOpacity onPress={() => setIsPopupVisible(true)}>
+          <TouchableOpacity
+            onPress={() => router.push('/menu?context=topBarDelivery')}
+          >
             <Avatar />
           </TouchableOpacity>
         </View>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 20c78a0..6da0b6a 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -5,6 +5,7 @@ import {
   ScrollView,
   TouchableOpacity,
   Animated,
+  BackHandler,
 } from 'react-native';
 import {
   ShoppingBagIcon,
@@ -31,6 +32,7 @@ import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
+import { useFocusEffect } from '@react-navigation/native';
 
 const CheckoutScreen = () => {
   const router = useRouter();
@@ -75,6 +77,23 @@ const CheckoutScreen = () => {
     fetchUserName();
   }, []);
 
+  useFocusEffect(
+    React.useCallback(() => {
+      const onBackPress = () => {
+        if (currentStep === stepsLabels.length) {
+          // Limpiar el carrito si el usuario está en el último paso
+          dispatch(clearCart());
+        }
+        return false; // Permitir el comportamiento predeterminado del retroceso
+      };
+
+      BackHandler.addEventListener('hardwareBackPress', onBackPress);
+
+      return () =>
+        BackHandler.removeEventListener('hardwareBackPress', onBackPress);
+    }, [currentStep]),
+  );
+
   const isSimplifiedSteps =
     (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
     (selectedOption === 'delivery' && selectedPayment === 'efectivo');
@@ -201,9 +220,6 @@ const CheckoutScreen = () => {
 
           console.log('Orden creada exitosamente:', orderResponse);
 
-          // Limpiar el carrito
-          dispatch(clearCart());
-
           setStatus('approved');
           setCurrentStep(stepsLabels.length);
         } catch (error) {
@@ -231,6 +247,8 @@ const CheckoutScreen = () => {
   };
 
   const handleGoToHome = () => {
+    // Limpiar el carrito al salir del flujo de checkout
+    dispatch(clearCart());
     router.dismissAll();
     router.replace({
       pathname: '/(tabs)',
diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
index 62686e5..ed7d1f1 100644
--- a/src/screens/MenuScreen.tsx
+++ b/src/screens/MenuScreen.tsx
@@ -10,17 +10,20 @@ import {
   ShieldCheckIcon,
   ShoppingCartIcon,
   UserIcon,
+  ArrowsRightLeftIcon,
 } from 'react-native-heroicons/outline';
 import { AuthService } from '../services/auth';
-import { useRouter } from 'expo-router';
+import { useRouter, useLocalSearchParams } from 'expo-router';
 import Popup from '../components/Popup';
 
 export default function MenuScreen() {
   const [userName, setUserName] = useState('');
+  const [userRole, setUserRole] = useState('');
   const [isActive, setIsActive] = useState('');
   const [isLogoutConfirmationVisible, setIsLogoutConfirmationVisible] =
     useState(false);
   const router = useRouter();
+  const { context } = useLocalSearchParams(); // Obtener el contexto desde los parámetros
 
   const items = [
     {
@@ -49,11 +52,37 @@ export default function MenuScreen() {
     },
   ];
 
+  // Agregar la opción para usuarios de tipo "delivery" solo si el contexto no es "topBarDelivery"
+  if (userRole === 'delivery' && context !== 'topBarDelivery') {
+    items.push({
+      id: '5',
+      title: 'Ir al flujo de Delivery',
+      icon: <ArrowsRightLeftIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/(delivery-tabs)'),
+    });
+  }
+
+  // Agregar la opción para volver al flujo regular si el contexto es "topBarDelivery"
+  if (context === 'topBarDelivery') {
+    items.push({
+      id: '6',
+      title: 'Volver al flujo regular',
+      icon: <ArrowsRightLeftIcon color={Colors.iconMainPrimary} />,
+      onPress: () => router.push('/(tabs)'),
+    });
+  }
+
   const handleLogout = async () => {
     try {
-      await AuthService.logout();
-      setIsLogoutConfirmationVisible(false);
-      router.replace('/login');
+      await AuthService.logout(); // Llama al método logout del servicio de autenticación
+      setIsLogoutConfirmationVisible(false); // Cierra el popup de confirmación
+
+      // Verificar si hay pantallas en la pila antes de llamar a dismissAll
+      if (router.canGoBack()) {
+        router.dismissAll();
+      }
+
+      router.replace('/login'); // Redirige a la pantalla de inicio de sesión
     } catch (error) {
       console.error('Error al cerrar sesión:', error);
     }
@@ -64,8 +93,10 @@ export default function MenuScreen() {
       try {
         const profile = await UserService.getProfile();
 
-        if (profile.success)
+        if (profile.success) {
           setUserName(profile.data.firstName + ' ' + profile.data.lastName);
+          setUserRole(profile.data.role); // Guardar el rol del usuario
+        }
       } catch (error) {
         console.log(error);
       }
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 0d39d26..9ca0574 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -1,43 +1,12 @@
-import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, TouchableOpacity } from 'react-native';
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors } from '../../styles/theme';
-import { UserService } from '../../services/user'; // Servicio para obtener el perfil del usuario
-import { useRouter } from 'expo-router';
 
 export default function OffersScreen() {
-  const [userRole, setUserRole] = useState<string | null>(null);
-  const router = useRouter();
-
-  useEffect(() => {
-    const fetchUserRole = async () => {
-      const profile = await UserService.getProfile();
-      if (profile.success) {
-        setUserRole(profile.data.role); // Establece el rol del usuario
-      }
-    };
-    fetchUserRole();
-  }, []);
-
-  const handleNavigateToDeliveryFlow = () => {
-    router.push('/(delivery-tabs)'); // Redirige al flujo exclusivo para deliveries
-  };
-
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Ofertas</PoppinsText>
-
-      {/* Mostrar el botón solo si el rol es "delivery" */}
-      {userRole === 'delivery' && (
-        <TouchableOpacity
-          style={styles.deliveryButton}
-          onPress={handleNavigateToDeliveryFlow}
-        >
-          <PoppinsText style={styles.deliveryButtonText}>
-            Ir al flujo de Delivery
-          </PoppinsText>
-        </TouchableOpacity>
-      )}
     </View>
   );
 }
@@ -49,16 +18,4 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: Colors.bgColor,
   },
-  deliveryButton: {
-    marginTop: 20,
-    paddingVertical: 10,
-    paddingHorizontal: 20,
-    backgroundColor: Colors.primary,
-    borderRadius: 8,
-  },
-  deliveryButtonText: {
-    color: Colors.textWhite,
-    fontSize: 16,
-    fontWeight: 'bold',
-  },
 });
diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index be9c1f0..bc627ae 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -1,23 +1,23 @@
 import { api } from '../lib/sdkConfig';
 import * as SecureStore from 'expo-secure-store';
-import { PaymentInformation, PaymentMethod } from '@pharmatech/sdk';
+import { PaymentInfoResponse, PaymentMethod } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const PaymentInformationService = {
   findAll: async (
     paymentMethod?: PaymentMethod,
-  ): Promise<PaymentInformation[]> => {
+  ): Promise<PaymentInfoResponse[]> => {
     try {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      const response = await api.paymentInformation.findAll({
-        paymentMethod,
-      });
+      // Llamar al método findAll con el argumento directamente
+      const response = await api.paymentInformation.findAll(paymentMethod);
 
-      return response.results;
+      // La respuesta ahora es directamente un array de PaymentInfoResponse
+      return [response];
     } catch (error) {
       console.error('Error en PaymentInformationService.findAll:', error);
       throw new Error(extractErrorMessage(error));

From c9572e70c76644405b390fc487db47e97552b361 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 22 Apr 2025 21:33:23 -0400
Subject: [PATCH 144/291] Added title

---
 src/screens/tab/CategoriesScreen.tsx | 10 +++++++++-
 1 file changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index d688b2b..f446b72 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -9,7 +9,7 @@ import {
   ListRenderItem,
 } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
+import { Colors, FontSizes } from '../../styles/theme';
 import Alert from '../../components/Alerts';
 import { CategoryService } from '../../services/category';
 import { CategoryResponse } from '@pharmatech/sdk';
@@ -68,6 +68,9 @@ export default function CategoriesScreen() {
           />
         )}
       </View>
+      <PoppinsText style={styles.title} weight="semibold">
+        Categorías
+      </PoppinsText>
       <FlatList
         data={categories}
         renderItem={renderItem}
@@ -95,6 +98,11 @@ const styles = StyleSheet.create({
     right: 0,
     zIndex: 1000,
   },
+  title: {
+    margin: 5,
+    paddingHorizontal: 10,
+    fontSize: FontSizes.b1.size,
+  },
   listContainer: {
     marginHorizontal: 10,
   },

From 6cba3aa64b7531f04b239c8650a210799754bf26 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 22:04:22 -0400
Subject: [PATCH 145/291] Small fixes for delivery

---
 src/screens/delivery/DeliveryDetailScreen.tsx | 61 ++++++++++++++-----
 .../delivery/DeliveryHistoryScreen.tsx        | 20 +++---
 2 files changed, 57 insertions(+), 24 deletions(-)

diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index e638177..5cb5324 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -12,6 +12,7 @@ import PoppinsText from '../../components/PoppinsText';
 import Button from '../../components/Button';
 import DeliveryMap from '../../components/DeliveryMap';
 import CustomerAvatar from '../../components/CustomerAvatar';
+import Alert from '../../components/Alerts';
 import { Colors, FontSizes } from '../../styles/theme';
 import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
@@ -33,6 +34,13 @@ const DeliveryDetailScreen: React.FC = () => {
   const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
   const router = useRouter();
 
+  // Estados para las alertas
+  const [showAlert, setShowAlert] = useState(false);
+  const [alertType, setAlertType] = useState<'success' | 'error' | 'info'>(
+    'info',
+  );
+  const [alertMessage, setAlertMessage] = useState('');
+
   const deliveryStates = [
     'Buscando pedido en sucursal de origen',
     'Haciendo entrega del pedido',
@@ -103,21 +111,8 @@ const DeliveryDetailScreen: React.FC = () => {
   }, [id]);
 
   const handleNextState = async () => {
-    console.log(
-      'handleNextState called, current deliveryState:',
-      deliveryState,
-    );
-    console.log('Current button state:', buttonStates[deliveryState]);
-    console.log('deliveryState:', deliveryState);
-    console.log('buttonStates[deliveryState]:', buttonStates[deliveryState]);
-    console.log(
-      'Comparison result:',
-      buttonStates[deliveryState] === 'Finalizar entrega',
-    );
-
     try {
       if (deliveryState === 5) {
-        console.log('Forcing Finalizar entrega case');
         router.replace('/(delivery-tabs)');
         return;
       }
@@ -159,11 +154,28 @@ const DeliveryDetailScreen: React.FC = () => {
             break;
         }
 
-        // Avanzar al siguiente estado del botón
+        setAlertType('info');
+        setAlertMessage('Se actualizó el estado del pedido.');
+        setShowAlert(true);
+
+        // Agregar timeout para ocultar la alerta automáticamente
+        setTimeout(() => {
+          setShowAlert(false);
+        }, 3000); // 3 segundos
+
         setDeliveryState(deliveryState + 1);
       }
     } catch (error) {
       console.error('Error al actualizar el estado del delivery:', error);
+
+      setAlertType('error');
+      setAlertMessage('Hubo un problema al actualizar el estado del pedido.');
+      setShowAlert(true);
+
+      // Agregar timeout para ocultar la alerta automáticamente
+      setTimeout(() => {
+        setShowAlert(false);
+      }, 2000);
     }
   };
 
@@ -183,6 +195,19 @@ const DeliveryDetailScreen: React.FC = () => {
 
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+      {/* Mostrar alertas */}
+      {showAlert && (
+        <View style={styles.alertContainer}>
+          <Alert
+            type={alertType}
+            title={alertType === 'info' ? 'Información' : 'Error'}
+            message={alertMessage}
+            borderColor
+            onClose={() => setShowAlert(false)}
+          />
+        </View>
+      )}
+
       <ScrollView contentContainerStyle={styles.container}>
         {/* Título y botón de información */}
         <View style={styles.header}>
@@ -501,6 +526,14 @@ const styles = StyleSheet.create({
   scrollSpacer: {
     height: 64 + 16,
   },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -163,
+    top: 20,
+    zIndex: 1000,
+  },
 });
 
 export default DeliveryDetailScreen;
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 63bf2cd..16237e7 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -120,13 +120,10 @@ const DeliveryHistoryScreen: React.FC = () => {
               orderType="pedido"
               address={order.address?.adress || 'Dirección no disponible'}
               branch={branchNames[order.branchId] || 'Sucursal no disponible'}
-              estimatedTime={new Date(order.estimatedTime).toLocaleTimeString(
-                'es-VE',
-                {
-                  hour: '2-digit',
-                  minute: '2-digit',
-                },
-              )}
+              estimatedTime={calculateElapsedTime(
+                order.createdAt,
+                order.updatedAt,
+              )} // Tiempo transcurrido entre creación y última actualización
               elapsedTime={calculateElapsedTime(order.createdAt)}
               completionTime={new Date(order.updatedAt).toLocaleTimeString(
                 'es-VE',
@@ -148,11 +145,14 @@ const DeliveryHistoryScreen: React.FC = () => {
   );
 };
 
-const calculateElapsedTime = (createdAt: string): string => {
-  const now = new Date();
+const calculateElapsedTime = (
+  createdAt: string,
+  updatedAt?: string,
+): string => {
+  const endDate = updatedAt ? new Date(updatedAt) : new Date();
   const createdDate = new Date(createdAt);
   const diffInMinutes = Math.floor(
-    (now.getTime() - createdDate.getTime()) / (1000 * 60),
+    (endDate.getTime() - createdDate.getTime()) / (1000 * 60),
   );
 
   if (diffInMinutes < 60) {

From 184170f97d4be9ff8e6bc097a5a66924ff8de99a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 22 Apr 2025 23:12:07 -0400
Subject: [PATCH 146/291] Fixes to delivery flow so it works with a context

---
 src/components/TopBarDelivery.tsx             |  7 +--
 src/redux/slices/deliverySlice.ts             | 42 +++++++++++++++
 src/redux/store.ts                            |  2 +
 src/screens/delivery/DeliveryDetailScreen.tsx | 53 +++++++++----------
 .../delivery/DeliveryHistoryScreen.tsx        |  5 +-
 src/services/delivery.ts                      | 46 ++++++++++++----
 6 files changed, 108 insertions(+), 47 deletions(-)
 create mode 100644 src/redux/slices/deliverySlice.ts

diff --git a/src/components/TopBarDelivery.tsx b/src/components/TopBarDelivery.tsx
index 23ebe4b..2b4fa54 100644
--- a/src/components/TopBarDelivery.tsx
+++ b/src/components/TopBarDelivery.tsx
@@ -55,12 +55,7 @@ const TopBarDelivery = () => {
         </View>
 
         {/* Right notification icon */}
-        <TouchableOpacity
-          style={styles.iconButton}
-          onPress={() => {
-            router.push('/notifications'); // Redirige a la pantalla de notificaciones
-          }}
-        >
+        <TouchableOpacity style={styles.iconButton} onPress={() => {}}>
           <BellIcon size={26} color={Colors.textMain} />
         </TouchableOpacity>
       </View>
diff --git a/src/redux/slices/deliverySlice.ts b/src/redux/slices/deliverySlice.ts
new file mode 100644
index 0000000..e2f7d42
--- /dev/null
+++ b/src/redux/slices/deliverySlice.ts
@@ -0,0 +1,42 @@
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+import { OrderDeliveryDetailedResponse } from '@pharmatech/sdk';
+
+interface DeliveryState {
+  orders: Record<string, OrderDeliveryDetailedResponse>; // Almacenar múltiples órdenes por ID
+  deliveryState: Record<string, number>; // Estado de entrega por ID de orden
+}
+
+const initialState: DeliveryState = {
+  orders: {},
+  deliveryState: {},
+};
+
+const deliverySlice = createSlice({
+  name: 'delivery',
+  initialState,
+  reducers: {
+    setOrderDetails(
+      state,
+      action: PayloadAction<{
+        id: string;
+        details: OrderDeliveryDetailedResponse;
+      }>,
+    ) {
+      state.orders[action.payload.id] = action.payload.details;
+    },
+    setDeliveryState(
+      state,
+      action: PayloadAction<{ id: string; state: number }>,
+    ) {
+      state.deliveryState[action.payload.id] = action.payload.state;
+    },
+    resetOrderState(state, action: PayloadAction<string>) {
+      delete state.orders[action.payload];
+      delete state.deliveryState[action.payload];
+    },
+  },
+});
+
+export const { setOrderDetails, setDeliveryState, resetOrderState } =
+  deliverySlice.actions;
+export default deliverySlice.reducer;
diff --git a/src/redux/store.ts b/src/redux/store.ts
index 60b9866..e3b4670 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -1,9 +1,11 @@
 import { configureStore } from '@reduxjs/toolkit';
 import cartReducer from './slices/cartSlice'; // Importa el reducer del carrito
+import deliveryReducer from './slices/deliverySlice'; // Importa el reducer de entrega
 
 export const store = configureStore({
   reducer: {
     cart: cartReducer, // Conecta el slice del carrito
+    delivery: deliveryReducer,
   },
   devTools: true, // Habilita Redux DevTools
 });
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index 5cb5324..95af480 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -16,21 +16,28 @@ import Alert from '../../components/Alerts';
 import { Colors, FontSizes } from '../../styles/theme';
 import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
+import { OrderDeliveryStatus } from '@pharmatech/sdk';
+import { useDispatch, useSelector } from 'react-redux';
+import { RootState } from '../../redux/store';
 import {
-  OrderDeliveryDetailedResponse,
-  OrderDeliveryStatus,
-  BranchResponse,
-} from '@pharmatech/sdk';
+  setOrderDetails,
+  setDeliveryState,
+} from '../../redux/slices/deliverySlice';
 
 const DeliveryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
-  const [orderDetails, setOrderDetails] =
-    useState<OrderDeliveryDetailedResponse | null>(null);
+  const dispatch = useDispatch();
+  const orderDetails = useSelector(
+    (state: RootState) => state.delivery.orders[id as string],
+  );
+  const deliveryState = useSelector(
+    (state: RootState) => state.delivery.deliveryState[id as string] || 0,
+  );
+
   const [branchNames, setBranchNames] = useState<
     Record<string, { name: string; latitude: number; longitude: number }>
   >({});
   const [loading, setLoading] = useState(true);
-  const [deliveryState, setDeliveryState] = useState(0);
   const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
   const router = useRouter();
 
@@ -67,18 +74,12 @@ const DeliveryDetailScreen: React.FC = () => {
 
   useEffect(() => {
     const fetchOrderDetails = async () => {
-      try {
-        console.log('Fetching order details for delivery ID:', id);
+      if (!orderDetails) {
         const details = await DeliveryService.getOrderDetails(id as string);
-        console.log('Order details fetched:', details);
-
-        setOrderDetails(details);
-
-        // Validar si las coordenadas del cliente están disponibles
-        if (!details.address.latitude || !details.address.longitude) {
-          console.warn('Las coordenadas del cliente no están disponibles.');
-        }
+        dispatch(setOrderDetails({ id: id as string, details }));
+      }
 
+      try {
         // Obtener todas las sucursales y mapear sus nombres y coordenadas
         const branches = await BranchService.findAll({ page: 1, limit: 100 });
         const branchMap = branches.results.reduce(
@@ -87,7 +88,7 @@ const DeliveryDetailScreen: React.FC = () => {
               string,
               { name: string; latitude: number; longitude: number }
             >,
-            branch: BranchResponse,
+            branch,
           ) => {
             acc[branch.id] = {
               name: branch.name,
@@ -108,24 +109,18 @@ const DeliveryDetailScreen: React.FC = () => {
     };
 
     fetchOrderDetails();
-  }, [id]);
+  }, [id, orderDetails, dispatch]);
 
   const handleNextState = async () => {
     try {
       if (deliveryState === 5) {
+        router.dismiss(2);
         router.replace('/(delivery-tabs)');
         return;
       }
 
       if (deliveryState < buttonStates.length - 1) {
-        // Verifica si el estado actual es "Finalizar entrega"
-        if (buttonStates[deliveryState] === 'Finalizar entrega') {
-          console.log('Finalizar entrega case triggered');
-          router.replace('/login');
-          return;
-        }
-
-        // Actualizar el estado en el backend según el botón actual
+        // Actualizar el estado en el backend
         switch (buttonStates[deliveryState]) {
           case 'Comenzar entrega':
             await DeliveryService.updateOrderStatus(
@@ -163,7 +158,9 @@ const DeliveryDetailScreen: React.FC = () => {
           setShowAlert(false);
         }, 3000); // 3 segundos
 
-        setDeliveryState(deliveryState + 1);
+        dispatch(
+          setDeliveryState({ id: id as string, state: deliveryState + 1 }),
+        );
       }
     } catch (error) {
       console.error('Error al actualizar el estado del delivery:', error);
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 16237e7..6dab5ab 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -39,10 +39,9 @@ const DeliveryHistoryScreen: React.FC = () => {
       const employeeId = payload.sub;
 
       // Obtener órdenes completadas
-      const response = await DeliveryService.getAssignedOrders(
-        employeeId,
+      const response = await DeliveryService.getAssignedOrders(employeeId, [
         OrderDeliveryStatus.DELIVERED,
-      );
+      ]);
 
       // Obtener detalles de las órdenes
       const detailedOrders = await Promise.all(
diff --git a/src/services/delivery.ts b/src/services/delivery.ts
index cad37be..7e90940 100644
--- a/src/services/delivery.ts
+++ b/src/services/delivery.ts
@@ -14,12 +14,17 @@ export const DeliveryService = {
   /**
    * Listar órdenes asignadas al delivery.
    * @param employeeId - ID del motorizado (delivery).
-   * @param status - Estado de las órdenes a filtrar (por defecto: 'ASSIGNED').
+   * @param statuses - Lista de estados de las órdenes a filtrar (por defecto: ['ASSIGNED', 'WAITING_CONFIRMATION', 'PICKED_UP', 'IN_ROUTE']).
    * @returns Lista paginada de órdenes asignadas.
    */
   getAssignedOrders: async (
     employeeId: string,
-    status: OrderDeliveryStatus = OrderDeliveryStatus.ASSIGNED,
+    statuses: OrderDeliveryStatus[] = [
+      OrderDeliveryStatus.ASSIGNED,
+      OrderDeliveryStatus.WAITING_CONFIRMATION,
+      OrderDeliveryStatus.PICKED_UP,
+      OrderDeliveryStatus.IN_ROUTE,
+    ],
   ): Promise<Pagination<OrderDeliveryResponse>> => {
     try {
       const jwt = await SecureStore.getItemAsync('auth_token');
@@ -27,16 +32,37 @@ export const DeliveryService = {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      const response = await api.deliveryService.findAll(
+      // Realizar múltiples llamadas al backend, una por cada estado
+      const responses = await Promise.all(
+        statuses.map((status) =>
+          api.deliveryService.findAll(
+            {
+              employeeId,
+              status,
+              page: 1,
+              limit: 10,
+            } as OrderDeliveryPaginationRequest,
+            jwt,
+          ),
+        ),
+      );
+
+      // Combinar los resultados de todas las llamadas
+      const combinedResults = responses.reduce(
+        (acc, response) => {
+          acc.results = acc.results.concat(response.results);
+          acc.count += response.count;
+          return acc;
+        },
         {
-          employeeId,
-          status,
-          page: 1,
-          limit: 10,
-        } as OrderDeliveryPaginationRequest,
-        jwt,
+          results: [],
+          count: 0,
+          next: null,
+          previous: null,
+        } as Pagination<OrderDeliveryResponse>,
       );
-      return response;
+
+      return combinedResults;
     } catch (error) {
       console.error('Error al obtener las órdenes asignadas:', error);
       throw new Error(extractErrorMessage(error));

From 6d1a0b0a2d927f088e02f0d6cef9934fd8a5c545 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 22 Apr 2025 23:19:27 -0400
Subject: [PATCH 147/291] Added others selectors and added products

---
 src/screens/SearchProductScreen.tsx | 144 +++++++++++++++++++++-------
 src/services/products.ts            |  22 +++++
 2 files changed, 133 insertions(+), 33 deletions(-)

diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 48c17c8..49350cb 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -5,6 +5,9 @@ import {
   TouchableOpacity,
   SafeAreaView,
   Dimensions,
+  FlatList,
+  ListRenderItem,
+  ScrollView,
 } from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
@@ -13,10 +16,15 @@ import PoppinsText from '../components/PoppinsText';
 import { ProductService } from '../services/products';
 import { AdjustmentsHorizontalIcon } from 'react-native-heroicons/solid';
 import FilterOptions from '../components/FilterOptions';
-import { ManufacturerResponse, ProductPresentation } from '@pharmatech/sdk';
+import {
+  ManufacturerResponse,
+  PresentationResponse,
+  ProductPresentation,
+} from '@pharmatech/sdk';
 import Checkbox from '../components/Checkbox';
 import Steps from '../components/Steps';
 import Button from '../components/Button';
+import ProductCard from '../components/Card';
 
 export default function SearchProductScreen() {
   const { query } = useLocalSearchParams<{ query: string }>();
@@ -24,19 +32,61 @@ export default function SearchProductScreen() {
   const [search, setSearch] = useState<ProductPresentation[]>();
   const [isVisible, setIsVisible] = useState(false);
   const [brands, setBrands] = useState<ManufacturerResponse[]>();
+  const [presentations, setPresentations] = useState<PresentationResponse[]>();
+
+  const [selectedBrands, setSelectedBrands] = useState<ManufacturerResponse[]>(
+    [],
+  );
+
+  const handleBrandToggle = (brand: ManufacturerResponse) => {
+    setSelectedBrands((prevSelected) => {
+      const exists = prevSelected.some((b) => b.id === brand.id);
+      if (exists) {
+        return prevSelected.filter((b) => b.id !== brand.id);
+      } else {
+        return [...prevSelected, brand];
+      }
+    });
+  };
 
   useEffect(() => {
     const fetchSearchData = async () => {
       const searchData = await ProductService.getProducts(1, 20, { q: query });
       const brands = await ProductService.getBrands(1, 100);
-      console.log(search);
+      const presentations = await ProductService.getPresentations(1, 100);
+
       if (searchData.success) setSearch(searchData.data.results);
       if (brands.success) setBrands(brands.data.results);
+      if (presentations.success) setPresentations(presentations.data.results);
     };
 
     fetchSearchData();
   }, []);
 
+  const renderItem: ListRenderItem<ProductPresentation> = ({ item }) => (
+    <ProductCard
+      id={item.id}
+      presentationId={item.presentation.id}
+      productId={item.product.id}
+      name={
+        item.product.name +
+        ' ' +
+        item.presentation.name +
+        ' ' +
+        item.presentation.quantity +
+        ' ' +
+        item.presentation.measurementUnit
+      }
+      category={item.product.categories[0].name}
+      imageUrl={item.product.images[0].url}
+      originalPrice={item.price}
+      discount={10}
+      finalPrice={item.price * 0.1}
+      quantity={10}
+      getQuantity={() => console.log}
+    />
+  );
+
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
@@ -55,11 +105,21 @@ export default function SearchProductScreen() {
         <View style={{ marginVertical: 5 }}>
           <PoppinsText>Resultados de la búsqueda: {query}</PoppinsText>
           <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
-            {60} resultados
+            {search?.length} resultados
           </PoppinsText>
         </View>
       </View>
-      <SafeAreaView style={styles.container}></SafeAreaView>
+      <SafeAreaView style={styles.container}>
+        <FlatList
+          data={search}
+          renderItem={renderItem}
+          keyExtractor={(item) => item.id.toString()}
+          numColumns={2}
+          contentContainerStyle={styles.listContainer}
+          showsVerticalScrollIndicator={true}
+          alwaysBounceVertical={true}
+        />
+      </SafeAreaView>
       <FilterOptions visible={isVisible} onClose={() => setIsVisible(false)}>
         <View
           style={{
@@ -75,39 +135,53 @@ export default function SearchProductScreen() {
           </PoppinsText>
           <AdjustmentsHorizontalIcon size={20} color={Colors.iconMainDefault} />
         </View>
-        <View style={{ paddingVertical: 10 }}>
-          <View>
-            <PoppinsText weight="medium">Categoría</PoppinsText>
-            <View></View>
-          </View>
-          <View>
-            <PoppinsText weight="medium">Marca o Laboratorio</PoppinsText>
+        <ScrollView>
+          <View style={{ paddingVertical: 10 }}>
             <View>
-              {brands?.map((b, index) => (
-                <Checkbox
-                  key={index}
-                  checked={false}
-                  label={b.name}
-                  onChange={(e) => (e ? '' : null)}
-                  style={{ margin: 3 }}
-                  size={20}
-                />
-              ))}
+              <PoppinsText weight="medium">Categoría</PoppinsText>
+              <View></View>
+            </View>
+            <View style={{ marginTop: 20 }}>
+              <PoppinsText weight="medium">Marca o Laboratorio</PoppinsText>
+              <View>
+                {brands?.map((b, index) => (
+                  <Checkbox
+                    key={index}
+                    checked={selectedBrands.some((b) => b.name === b.name)}
+                    label={b.name}
+                    onChange={() => handleBrandToggle(b)}
+                    style={{ margin: 3 }}
+                    size={20}
+                  />
+                ))}
+              </View>
+            </View>
+            <View style={{ marginTop: 20 }}>
+              <PoppinsText weight="medium">Presentación</PoppinsText>
+              <View>
+                {presentations?.map((b, index) => (
+                  <Checkbox
+                    key={index}
+                    checked={false}
+                    label={b.name + ' ' + b.quantity + ' ' + b.measurementUnit}
+                    onChange={(e) => (e ? '' : null)}
+                    style={{ margin: 3 }}
+                    size={20}
+                  />
+                ))}
+              </View>
             </View>
           </View>
-          <View>
-            <PoppinsText weight="medium">Presentación</PoppinsText>
+          <View style={{ marginTop: 20 }}>
+            <PoppinsText weight="medium">Precio</PoppinsText>
+            <Steps
+              totalSteps={2}
+              currentStep={2}
+              labels={['Bs. 40.00', 'Bs. 1000.00']}
+            />
+            <Button title="Filtrar" />
           </View>
-        </View>
-        <View>
-          <PoppinsText weight="medium">Precio</PoppinsText>
-          <Steps
-            totalSteps={2}
-            currentStep={2}
-            labels={['Bs. 40.00', 'Bs. 1000.00']}
-          />
-          <Button title="Filtrar" />
-        </View>
+        </ScrollView>
       </FilterOptions>
     </View>
   );
@@ -121,6 +195,10 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
+  listContainer: {
+    flex: 1,
+    marginHorizontal: 20,
+  },
   productImage: {
     width: width,
     height: 200,
diff --git a/src/services/products.ts b/src/services/products.ts
index 0cbf709..e560a05 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -9,6 +9,7 @@ import {
   ManufacturerResponse,
   ProductPaginationRequest,
   ProductPresentationDetailResponse,
+  PresentationResponse,
 } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
 import { extractErrorMessage } from '../utils/errorHandler';
@@ -53,7 +54,28 @@ export const ProductService = {
       };
     }
   },
+  getPresentations: async (
+    page: number,
+    limit: number,
+  ): Promise<ServiceResponse<Pagination<PresentationResponse>>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+      const presentations = await api.presentation.findAll(
+        { page, limit },
+        token,
+      );
 
+      return { success: true, data: presentations };
+    } catch (error) {
+      return {
+        success: false,
+        error: extractErrorMessage(error),
+      };
+    }
+  },
   getGenericProduct: async (
     id: string,
   ): Promise<ServiceResponse<GenericProductResponse>> => {

From f84d9a9f393083b259bde69012db5f50aec15b0c Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Wed, 23 Apr 2025 00:21:46 -0400
Subject: [PATCH 148/291] Changed checkbox and updated in searchProduct

---
 src/components/Checkbox.tsx         |   6 +-
 src/screens/SearchProductScreen.tsx | 106 +++++++++++++++++++++++-----
 2 files changed, 91 insertions(+), 21 deletions(-)

diff --git a/src/components/Checkbox.tsx b/src/components/Checkbox.tsx
index 3631545..7b8233d 100644
--- a/src/components/Checkbox.tsx
+++ b/src/components/Checkbox.tsx
@@ -6,8 +6,9 @@ import PoppinsText from './PoppinsText';
 
 interface CheckboxProps {
   checked: boolean;
-  onChange: (checked: boolean) => void;
+  onChange: (checked: boolean, value: string) => void;
   label?: string;
+  value: string;
   disabled?: boolean;
   color?: string;
   size?: number;
@@ -18,6 +19,7 @@ const Checkbox: React.FC<CheckboxProps> = ({
   checked,
   onChange,
   label,
+  value,
   disabled = false,
   color = Colors.primary,
   size = 24,
@@ -25,7 +27,7 @@ const Checkbox: React.FC<CheckboxProps> = ({
 }) => {
   const handlePress = () => {
     if (!disabled) {
-      onChange(!checked);
+      onChange(!checked, value);
     }
   };
 
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 49350cb..5a196eb 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -17,6 +17,7 @@ import { ProductService } from '../services/products';
 import { AdjustmentsHorizontalIcon } from 'react-native-heroicons/solid';
 import FilterOptions from '../components/FilterOptions';
 import {
+  CategoryResponse,
   ManufacturerResponse,
   PresentationResponse,
   ProductPresentation,
@@ -25,6 +26,7 @@ import Checkbox from '../components/Checkbox';
 import Steps from '../components/Steps';
 import Button from '../components/Button';
 import ProductCard from '../components/Card';
+import { CategoryService } from '../services/category';
 
 export default function SearchProductScreen() {
   const { query } = useLocalSearchParams<{ query: string }>();
@@ -32,21 +34,57 @@ export default function SearchProductScreen() {
   const [search, setSearch] = useState<ProductPresentation[]>();
   const [isVisible, setIsVisible] = useState(false);
   const [brands, setBrands] = useState<ManufacturerResponse[]>();
+  const [categories, setCategories] = useState<CategoryResponse[]>();
   const [presentations, setPresentations] = useState<PresentationResponse[]>();
 
-  const [selectedBrands, setSelectedBrands] = useState<ManufacturerResponse[]>(
+  const [selectedPresentations, setSelectedPresentations] = useState<string[]>(
     [],
   );
+  const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
+  const [selectedBrands, setSelectedBrands] = useState<string[]>([]);
 
-  const handleBrandToggle = (brand: ManufacturerResponse) => {
-    setSelectedBrands((prevSelected) => {
-      const exists = prevSelected.some((b) => b.id === brand.id);
-      if (exists) {
-        return prevSelected.filter((b) => b.id !== brand.id);
-      } else {
-        return [...prevSelected, brand];
-      }
+  const handleBrandToggle = (brand: boolean, value: string) => {
+    if (brand) {
+      setSelectedBrands([...selectedBrands, value]);
+      return [...selectedBrands, value];
+    } else {
+      setSelectedBrands((prev) => prev.filter((item) => item !== value));
+    }
+  };
+
+  const handleCategoryToggle = (category: boolean, value: string) => {
+    if (category) {
+      setSelectedCategories([...selectedCategories, value]);
+      return [...selectedCategories, value];
+    } else {
+      setSelectedCategories((prev) => prev.filter((item) => item !== value));
+    }
+  };
+
+  const handlePresentationToggle = (presentation: boolean, value: string) => {
+    if (presentation) {
+      setSelectedPresentations([...selectedPresentations, value]);
+      return [...selectedPresentations, value];
+    } else {
+      setSelectedPresentations((prev) => prev.filter((item) => item !== value));
+    }
+  };
+
+  const clearFilters = () => {
+    setSelectedBrands([]);
+    setSelectedCategories([]);
+    setSelectedPresentations([]);
+  };
+
+  const submitFilters = async () => {
+    const searchData = await ProductService.getProducts(1, 20, {
+      q: query,
+      manufacturerId: selectedBrands,
+      categoryId: selectedCategories,
+      presentationId: selectedPresentations,
     });
+
+    if (searchData.success) setSearch(searchData.data.results);
   };
 
   useEffect(() => {
@@ -54,10 +92,12 @@ export default function SearchProductScreen() {
       const searchData = await ProductService.getProducts(1, 20, { q: query });
       const brands = await ProductService.getBrands(1, 100);
       const presentations = await ProductService.getPresentations(1, 100);
+      const categories = await CategoryService.getCategories(1, 100);
 
       if (searchData.success) setSearch(searchData.data.results);
       if (brands.success) setBrands(brands.data.results);
       if (presentations.success) setPresentations(presentations.data.results);
+      if (categories.success) setCategories(categories.data.results);
     };
 
     fetchSearchData();
@@ -130,16 +170,42 @@ export default function SearchProductScreen() {
             borderColor: Colors.gray_100,
           }}
         >
-          <PoppinsText style={{ color: Colors.primary, paddingEnd: 5 }}>
-            Filtros
-          </PoppinsText>
-          <AdjustmentsHorizontalIcon size={20} color={Colors.iconMainDefault} />
+          <View
+            style={{
+              flexDirection: 'row',
+              marginHorizontal: 80,
+              paddingStart: 60,
+            }}
+          >
+            <PoppinsText style={{ color: Colors.primary, paddingEnd: 5 }}>
+              Filtros
+            </PoppinsText>
+            <AdjustmentsHorizontalIcon
+              size={20}
+              color={Colors.iconMainDefault}
+            />
+          </View>
+          <TouchableOpacity onPress={clearFilters}>
+            <PoppinsText>Limpiar</PoppinsText>
+          </TouchableOpacity>
         </View>
         <ScrollView>
           <View style={{ paddingVertical: 10 }}>
             <View>
               <PoppinsText weight="medium">Categoría</PoppinsText>
-              <View></View>
+              <View>
+                {categories?.map((b, index) => (
+                  <Checkbox
+                    key={index}
+                    checked={selectedCategories.includes(b.id)}
+                    label={b.name}
+                    value={b.id}
+                    onChange={(e, val) => handleCategoryToggle(e, val)}
+                    style={{ margin: 3 }}
+                    size={20}
+                  />
+                ))}
+              </View>
             </View>
             <View style={{ marginTop: 20 }}>
               <PoppinsText weight="medium">Marca o Laboratorio</PoppinsText>
@@ -147,9 +213,10 @@ export default function SearchProductScreen() {
                 {brands?.map((b, index) => (
                   <Checkbox
                     key={index}
-                    checked={selectedBrands.some((b) => b.name === b.name)}
+                    checked={selectedBrands.includes(b.id)}
                     label={b.name}
-                    onChange={() => handleBrandToggle(b)}
+                    value={b.id}
+                    onChange={(e, val) => handleBrandToggle(e, val)}
                     style={{ margin: 3 }}
                     size={20}
                   />
@@ -162,9 +229,10 @@ export default function SearchProductScreen() {
                 {presentations?.map((b, index) => (
                   <Checkbox
                     key={index}
-                    checked={false}
+                    checked={selectedPresentations.includes(b.id)}
                     label={b.name + ' ' + b.quantity + ' ' + b.measurementUnit}
-                    onChange={(e) => (e ? '' : null)}
+                    value={b.id}
+                    onChange={(e, val) => handlePresentationToggle(e, val)}
                     style={{ margin: 3 }}
                     size={20}
                   />
@@ -179,7 +247,7 @@ export default function SearchProductScreen() {
               currentStep={2}
               labels={['Bs. 40.00', 'Bs. 1000.00']}
             />
-            <Button title="Filtrar" />
+            <Button title="Filtrar" onPress={submitFilters} />
           </View>
         </ScrollView>
       </FilterOptions>

From d5da1ee7fdfeabdba0271016d67a2463b4099938 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Wed, 23 Apr 2025 00:36:04 -0400
Subject: [PATCH 149/291] Resolved errors

---
 src/services/products.ts | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/services/products.ts b/src/services/products.ts
index e560a05..1be151c 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -63,10 +63,7 @@ export const ProductService = {
       if (!token) {
         throw new Error('No se encontró el token de autenticación');
       }
-      const presentations = await api.presentation.findAll(
-        { page, limit },
-        token,
-      );
+      const presentations = await api.presentation.findAll({ page, limit });
 
       return { success: true, data: presentations };
     } catch (error) {
@@ -131,7 +128,7 @@ export const ProductService = {
         throw new Error('No se encontró el token de autenticación');
       }
 
-      const response = await api.manufacturer.findAll({ page, limit }, token);
+      const response = await api.manufacturer.findAll({ page, limit });
 
       return { success: true, data: response };
     } catch (error) {

From 08956104b95b2ee6ed6dc419442bab967e04c7db Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Wed, 23 Apr 2025 00:54:14 -0400
Subject: [PATCH 150/291] Added truncate order id

---
 src/screens/OrderDetailScreen.tsx | 6 ++++--
 src/screens/OrdersScreen.tsx      | 5 ++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 25bc059..5f33476 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -14,6 +14,7 @@ import Alert from '../components/Alerts';
 import { UserService } from '../services/user';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { OrderDetailedResponse } from '@pharmatech/sdk';
+import { truncateString } from '../utils/commons';
 
 const OrderDetailScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -66,7 +67,6 @@ const OrderDetailScreen = () => {
             message="Pedido agregado al carrito"
             onClose={() => {
               setShowSuccessAlert(false);
-              router.replace('/cart');
             }}
             borderColor
           />
@@ -91,7 +91,9 @@ const OrderDetailScreen = () => {
         >
           <View>
             <PoppinsText>Número de pedido:</PoppinsText>
-            <PoppinsText>{order?.id}</PoppinsText>
+            <PoppinsText>
+              {order ? truncateString(order?.id, 8) : ''}
+            </PoppinsText>
           </View>
           <Button
             title="Re ordenar"
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index d4841a6..bbf7d2d 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -7,6 +7,7 @@ import Alert from '../components/Alerts';
 import Button from '../components/Button';
 import { OrderResponse } from '@pharmatech/sdk'; // Usar el tipo del SDK
 import { UserService } from '../services/user';
+import { truncateString } from '../utils/commons';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -92,7 +93,9 @@ const OrdersScreen = () => {
                   }}
                 >
                   <View>
-                    <PoppinsText>{order.id}</PoppinsText>
+                    <PoppinsText>
+                      {order ? truncateString(order?.id, 8) : ''}
+                    </PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
                       {new Date(order.createdAt).toLocaleDateString()}{' '}
                       {/* Formatear fecha */}

From 12a516cc10a84f50a9fbac983505027bdf138e41 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 25 Apr 2025 20:33:05 -0400
Subject: [PATCH 151/291] Ya los metodos de pago estan conectados con el SDK y
 no estan harcodeados

---
 src/components/PaymentMethods.tsx | 97 +++++++++++++++----------------
 1 file changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/components/PaymentMethods.tsx b/src/components/PaymentMethods.tsx
index dae863c..f6f3224 100644
--- a/src/components/PaymentMethods.tsx
+++ b/src/components/PaymentMethods.tsx
@@ -3,39 +3,49 @@ import { View, StyleSheet } from 'react-native';
 import RadioButton from './RadioButton';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
+import { PaymentMethod } from '@pharmatech/sdk';
+
+type PaymentOptionValue =
+  | 'punto_de_venta'
+  | 'efectivo'
+  | 'transferencia'
+  | 'pago_movil';
 
 interface PaymentMethodsProps {
   selectedOption: 'pickup' | 'delivery' | null;
-  selectedPayment:
-    | 'punto_de_venta'
-    | 'efectivo'
-    | 'transferencia'
-    | 'pago_movil'
-    | null;
-  setSelectedPayment: (
-    value: 'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil',
-  ) => void;
+  selectedPayment: PaymentOptionValue | null;
+  setSelectedPayment: (value: PaymentOptionValue) => void;
 }
 
+const labelMap: Record<PaymentMethod, string> = {
+  [PaymentMethod.CARD]: 'Punto de Venta',
+  [PaymentMethod.CASH]: 'Efectivo',
+  [PaymentMethod.BANK_TRANSFER]: 'Transferencia Bancaria',
+  [PaymentMethod.MOBILE_PAYMENT]: 'Pago Móvil',
+};
+
+const valueMap: Record<PaymentMethod, PaymentOptionValue> = {
+  [PaymentMethod.CARD]: 'punto_de_venta',
+  [PaymentMethod.CASH]: 'efectivo',
+  [PaymentMethod.BANK_TRANSFER]: 'transferencia',
+  [PaymentMethod.MOBILE_PAYMENT]: 'pago_movil',
+};
+
+const ALL_METHODS: PaymentMethod[] = [
+  PaymentMethod.CARD,
+  PaymentMethod.CASH,
+  PaymentMethod.BANK_TRANSFER,
+  PaymentMethod.MOBILE_PAYMENT,
+];
+
 const PaymentMethods: React.FC<PaymentMethodsProps> = ({
   selectedOption,
   selectedPayment,
   setSelectedPayment,
 }) => {
-  const paymentOptions = [
-    { label: 'Punto de Venta', value: 'punto_de_venta' },
-    { label: 'Efectivo', value: 'efectivo' },
-    { label: 'Transferencia Bancaria', value: 'transferencia' },
-    { label: 'Pago Móvil', value: 'pago_movil' },
-  ];
-
-  const filteredOptions = paymentOptions.filter((option) => {
-    if (selectedOption === 'pickup' && option.value === 'efectivo') {
-      return false;
-    }
-    if (selectedOption === 'delivery' && option.value === 'punto_de_venta') {
-      return false;
-    }
+  const filtered = ALL_METHODS.filter((m) => {
+    if (selectedOption === 'pickup' && m === PaymentMethod.CASH) return false;
+    if (selectedOption === 'delivery' && m === PaymentMethod.CARD) return false;
     return true;
   });
 
@@ -45,46 +55,35 @@ const PaymentMethods: React.FC<PaymentMethodsProps> = ({
         Seleccione el método de pago
       </PoppinsText>
       <View style={styles.divider} />
-      <View>
-        {filteredOptions.map((option) => (
-          <View key={option.value} style={styles.optionSpacing}>
+
+      {filtered.map((m) => {
+        const uiValue = valueMap[m];
+        return (
+          <View key={m} style={styles.optionSpacing}>
             <RadioButton
-              label={option.label}
-              value={option.value}
-              selectedValue={selectedPayment || ''}
+              label={labelMap[m]}
+              value={uiValue}
+              selectedValue={selectedPayment ?? ''}
               onValueChange={(value) =>
-                setSelectedPayment(
-                  value as
-                    | 'punto_de_venta'
-                    | 'efectivo'
-                    | 'transferencia'
-                    | 'pago_movil',
-                )
-              } // Explicitly cast the value
+                setSelectedPayment(value as PaymentOptionValue)
+              }
             />
           </View>
-        ))}
-      </View>
+        );
+      })}
     </View>
   );
 };
 
 const styles = StyleSheet.create({
-  container: {
-    width: '100%',
-  },
-  title: {
-    color: Colors.gray_500,
-  },
+  container: { width: '100%' },
+  title: { color: Colors.gray_500 },
   divider: {
     height: 1,
     backgroundColor: Colors.gray_100,
     marginVertical: 20,
   },
-  optionSpacing: {
-    marginBottom: 10,
-    paddingLeft: 20,
-  },
+  optionSpacing: { marginBottom: 10, paddingLeft: 20 },
 });
 
 export default PaymentMethods;

From 20f34499ad8c8cffb26644edb03a76d30e7eff1d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 25 Apr 2025 22:14:14 -0400
Subject: [PATCH 152/291] Add validation popup for incomplete checkout fields

---
 src/screens/CheckoutScreen.tsx | 584 +++++++++++++++++----------------
 1 file changed, 300 insertions(+), 284 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 6da0b6a..0de1d6c 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -33,6 +33,7 @@ import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
 import { useFocusEffect } from '@react-navigation/native';
+import Popup from '../components/Popup'; // Import the Popup component
 
 const CheckoutScreen = () => {
   const router = useRouter();
@@ -59,6 +60,8 @@ const CheckoutScreen = () => {
     longitude: number;
   } | null>(null);
   const [orderNumber, setOrderNumber] = useState<string | null>(null);
+  const [popupVisible, setPopupVisible] = useState(false);
+  const [popupMessages, setPopupMessages] = useState<string[]>([]);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -134,102 +137,125 @@ const CheckoutScreen = () => {
   };
 
   const handleContinue = async () => {
-    if (currentStep < stepsLabels.length) {
-      if (currentStep === stepsLabels.length - 1) {
-        try {
-          if (selectedOption === 'pickup' && !isValidUUID(selectedLocation)) {
-            setErrorMessage('La sucursal seleccionada no es válida.');
-            setStatus('rejected');
-            setCurrentStep(stepsLabels.length);
-            return;
-          }
-
-          if (selectedOption === 'delivery' && !isValidUUID(selectedLocation)) {
-            setErrorMessage('La dirección seleccionada no es válida.');
-            setStatus('rejected');
-            setCurrentStep(stepsLabels.length);
-            return;
-          }
-
-          if (!selectedOption) {
-            setErrorMessage('Debe seleccionar una opción de compra.');
-            setStatus('rejected');
-            setCurrentStep(stepsLabels.length);
-            return;
-          }
-
-          setErrorMessage(null);
-
-          // Validar los productos del carrito
-          const products: CreateOrderDetail[] = cartItems
-            .filter((item) => item.quantity > 0)
-            .map((item) => ({
-              productPresentationId: item.id,
-              quantity: item.quantity, // Solo incluir los campos esperados
-            }));
-
-          if (products.length === 0) {
-            console.error('No hay productos válidos para procesar el pedido.');
-            setErrorMessage('No hay productos válidos en el carrito.');
-            setStatus('rejected');
-            return;
-          }
-
-          // Log del carrito y los productos seleccionados
-          console.log('Productos en el carrito:', cartItems);
-          console.log('Productos seleccionados para la orden:', products);
-
-          // Construir el payload de la orden
-          const orderPayload: CreateOrder = {
-            type:
-              selectedOption === 'pickup'
-                ? OrderType.PICKUP
-                : OrderType.DELIVERY,
-            branchId:
-              selectedOption === 'pickup'
-                ? selectedLocation || undefined
-                : undefined,
-            userAddressId:
-              selectedOption === 'delivery'
-                ? selectedLocation || undefined
-                : undefined,
-            products,
-          };
-
-          // Log del payload que se enviará al backend
-          console.log('Payload enviado al backend:', orderPayload);
-
-          // Enviar la orden al backend
-          const orderResponse = await OrderService.create(orderPayload);
-
-          // Log de la respuesta del backend
-          console.log('Respuesta del backend:', orderResponse);
-
-          // Validar la respuesta
-          if (!orderResponse?.id) {
-            setErrorMessage(
-              'No pudimos procesar tu orden. Inténtalo nuevamente.',
-            );
-            setStatus('rejected');
-            setCurrentStep(stepsLabels.length);
-            return;
-          }
-
-          // Guardar el número de orden generado
-          setOrderNumber(orderResponse.id);
-
-          console.log('Orden creada exitosamente:', orderResponse);
-
-          setStatus('approved');
-          setCurrentStep(stepsLabels.length);
-        } catch (error) {
-          console.error('Error al procesar la orden:', error);
-          setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
+    const missingFields: string[] = [];
+
+    if (currentStep < stepsLabels.length - 1) {
+      // Validation for steps before the confirmation step
+      if (currentStep === 1) {
+        if (!selectedOption)
+          missingFields.push('Seleccionar una opción de compra.');
+        if (!selectedLocation)
+          missingFields.push('Seleccionar una opción de locación.');
+        if (!selectedPayment)
+          missingFields.push('Seleccionar un método de pago.');
+      } else if (
+        currentStep === 2 &&
+        !isSimplifiedSteps &&
+        !isPaymentInfoValid
+      ) {
+        missingFields.push('Completar la información de pago.');
+      }
+
+      if (missingFields.length > 0) {
+        setPopupMessages(missingFields);
+        setPopupVisible(true);
+        return;
+      }
+
+      setCurrentStep(currentStep + 1);
+    } else if (currentStep === stepsLabels.length - 1) {
+      // Create the order on the penultimate step
+      try {
+        if (selectedOption === 'pickup' && !isValidUUID(selectedLocation)) {
+          setErrorMessage('La sucursal seleccionada no es válida.');
+          setStatus('rejected');
+          return;
+        }
+
+        if (selectedOption === 'delivery' && !isValidUUID(selectedLocation)) {
+          setErrorMessage('La dirección seleccionada no es válida.');
+          setStatus('rejected');
+          return;
+        }
+
+        if (!selectedOption) {
+          setErrorMessage('Debe seleccionar una opción de compra.');
+          setStatus('rejected');
+          return;
+        }
+
+        setErrorMessage(null);
+
+        // Validar los productos del carrito
+        const products: CreateOrderDetail[] = cartItems
+          .filter((item) => item.quantity > 0)
+          .map((item) => ({
+            productPresentationId: item.id,
+            quantity: item.quantity, // Solo incluir los campos esperados
+          }));
+
+        if (products.length === 0) {
+          setErrorMessage('No hay productos válidos en el carrito.');
+          setStatus('rejected');
+          return;
+        }
+
+        // Log del carrito y los productos seleccionados
+        console.log('Productos en el carrito:', cartItems);
+        console.log('Productos seleccionados para la orden:', products);
+
+        // Construir el payload de la orden
+        const orderPayload: CreateOrder = {
+          type:
+            selectedOption === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
+          branchId:
+            selectedOption === 'pickup'
+              ? selectedLocation || undefined
+              : undefined,
+          userAddressId:
+            selectedOption === 'delivery'
+              ? selectedLocation || undefined
+              : undefined,
+          products,
+        };
+
+        // Log del payload que se enviará al backend
+        console.log('Payload enviado al backend:', orderPayload);
+
+        // Enviar la orden al backend
+        const orderResponse = await OrderService.create(orderPayload);
+
+        // Log de la respuesta del backend
+        console.log('Respuesta del backend:', orderResponse);
+
+        // Validar la respuesta
+        if (!orderResponse?.id) {
+          setErrorMessage(
+            'No pudimos procesar tu orden. Inténtalo nuevamente.',
+          );
           setStatus('rejected');
+          return;
         }
-      } else {
-        setCurrentStep(currentStep + 1);
+
+        // Guardar el número de orden generado
+        setOrderNumber(orderResponse.id);
+
+        console.log('Orden creada exitosamente:', orderResponse);
+
+        setStatus('approved');
+        setCurrentStep(currentStep + 1); // Move to the confirmation step
+      } catch (error) {
+        console.error('Error al procesar la orden:', error);
+        setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
+        setStatus('rejected');
       }
+    } else if (currentStep === stepsLabels.length) {
+      // Limpiar el carrito al salir del flujo de checkout
+      dispatch(clearCart());
+      router.dismissAll();
+      router.replace({
+        pathname: '/(tabs)',
+      });
     }
   };
 
@@ -246,15 +272,6 @@ const CheckoutScreen = () => {
     }
   };
 
-  const handleGoToHome = () => {
-    // Limpiar el carrito al salir del flujo de checkout
-    dispatch(clearCart());
-    router.dismissAll();
-    router.replace({
-      pathname: '/(tabs)',
-    });
-  };
-
   const handleOpenMapModal = () => {
     if (selectedBranch) {
       setModalVisible(true); // Open the modal only if a branch is selected
@@ -263,20 +280,6 @@ const CheckoutScreen = () => {
     }
   };
 
-  const isStep1Complete =
-    selectedOption !== null &&
-    selectedPayment !== null &&
-    selectedLocation !== null;
-  const isStep2Complete =
-    isSimplifiedSteps || (selectedPayment !== null && isPaymentInfoValid);
-
-  const isButtonEnabled =
-    currentStep === 1
-      ? isStep1Complete
-      : currentStep === 2
-        ? isStep2Complete
-        : true;
-
   const renderConfirmationContent = (status: 'approved' | 'rejected') => {
     if (selectedOption === 'pickup' && status === 'approved') {
       return (
@@ -344,190 +347,203 @@ const CheckoutScreen = () => {
   };
 
   return (
-    <ScrollView contentContainerStyle={styles.scrollContainer}>
-      <View style={styles.container}>
-        {currentStep < stepsLabels.length && (
-          <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
-          </TouchableOpacity>
-        )}
-
-        <View style={styles.steps}>
-          <Animated.View style={{ opacity: 1 }}>
-            <Steps
-              totalSteps={stepsLabels.length}
-              currentStep={currentStep}
-              labels={stepsLabels}
-            />
-          </Animated.View>
-        </View>
+    <>
+      <Popup
+        visible={popupVisible}
+        type="center"
+        headerText="Datos Incompletos"
+        bodyText={popupMessages
+          .map((msg, index) => `${index + 1}. ${msg}`)
+          .join('\n')}
+        primaryButton={{
+          text: 'Aceptar',
+          onPress: () => setPopupVisible(false),
+        }}
+        onClose={() => setPopupVisible(false)}
+      />
+      <ScrollView contentContainerStyle={styles.scrollContainer}>
+        <View style={styles.container}>
+          {currentStep < stepsLabels.length && (
+            <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
+              <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
+            </TouchableOpacity>
+          )}
 
-        {errorMessage && (
-          <PoppinsText style={styles.errorMessage}>{errorMessage}</PoppinsText>
-        )}
+          <View style={styles.steps}>
+            <Animated.View style={{ opacity: 1 }}>
+              <Steps
+                totalSteps={stepsLabels.length}
+                currentStep={currentStep}
+                labels={stepsLabels}
+              />
+            </Animated.View>
+          </View>
 
-        {currentStep === 1 && (
-          <>
-            <PoppinsText style={styles.purchaseOptionsTitle}>
-              Opciones de Compra
+          {errorMessage && (
+            <PoppinsText style={styles.errorMessage}>
+              {errorMessage}
             </PoppinsText>
-            <View style={styles.radioContainer}>
-              <View style={styles.radioItem}>
-                <RadioCard
-                  label="Retiro en Sucursal"
-                  icon={<ShoppingBagIcon color={Colors.textMain} />}
-                  selected={selectedOption === 'pickup'}
-                  onPress={() => {
-                    setSelectedOption('pickup');
-                    setSelectedLocation(null);
-                  }}
+          )}
+
+          {currentStep === 1 && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Opciones de Compra
+              </PoppinsText>
+              <View style={styles.radioContainer}>
+                <View style={styles.radioItem}>
+                  <RadioCard
+                    label="Retiro en Sucursal"
+                    icon={<ShoppingBagIcon color={Colors.textMain} />}
+                    selected={selectedOption === 'pickup'}
+                    onPress={() => {
+                      setSelectedOption('pickup');
+                      setSelectedLocation(null);
+                    }}
+                  />
+                </View>
+                <View>
+                  <RadioCard
+                    label="Delivery"
+                    icon={<TruckIcon color={Colors.textMain} />}
+                    selected={selectedOption === 'delivery'}
+                    onPress={() => {
+                      setSelectedOption('delivery');
+                      setSelectedLocation(null);
+                    }}
+                  />
+                </View>
+              </View>
+              <LocationSelector
+                selectedOption={selectedOption || 'pickup'}
+                onSelect={(val) => setSelectedLocation(val)}
+                setSelectedBranch={setSelectedBranch}
+              />
+              <View style={styles.paymentMethods}>
+                <PaymentMethods
+                  selectedOption={selectedOption}
+                  selectedPayment={selectedPayment}
+                  setSelectedPayment={setSelectedPayment}
                 />
               </View>
-              <View>
-                <RadioCard
-                  label="Delivery"
-                  icon={<TruckIcon color={Colors.textMain} />}
-                  selected={selectedOption === 'delivery'}
-                  onPress={() => {
-                    setSelectedOption('delivery');
-                    setSelectedLocation(null);
-                  }}
+              {renderFooterMessage() && (
+                <PoppinsText style={styles.footerMessage}>
+                  {renderFooterMessage()}
+                </PoppinsText>
+              )}
+            </>
+          )}
+
+          {currentStep === 2 && !isSimplifiedSteps && (
+            <>
+              <PoppinsText
+                style={[styles.purchaseOptionsTitle, styles.step2Title]}
+              >
+                Visualización de datos
+              </PoppinsText>
+              <View style={styles.paymentInfoFormContainer}>
+                <PaymentInfoForm
+                  paymentMethod={selectedPayment}
+                  total={total.toFixed(2)}
+                  onValidationChange={setIsPaymentInfoValid}
+                  onBankChange={(value) => console.log('Bank changed:', value)}
+                  onReferenceChange={(value) =>
+                    console.log('Reference changed:', value)
+                  }
+                  onDocumentNumberChange={(value) =>
+                    console.log('Document number changed:', value)
+                  }
+                  onPhoneChange={(value) =>
+                    console.log('Phone changed:', value)
+                  }
                 />
               </View>
-            </View>
-            <LocationSelector
-              selectedOption={selectedOption || 'pickup'}
-              onSelect={(val) => setSelectedLocation(val)}
-              setSelectedBranch={setSelectedBranch}
-            />
-            <View style={styles.paymentMethods}>
-              <PaymentMethods
-                selectedOption={selectedOption}
-                selectedPayment={selectedPayment}
-                setSelectedPayment={setSelectedPayment}
-              />
-            </View>
-            {renderFooterMessage() && (
-              <PoppinsText style={styles.footerMessage}>
-                {renderFooterMessage()}
+            </>
+          )}
+
+          {currentStep === stepsLabels.length && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Confirmación de Orden
               </PoppinsText>
-            )}
-          </>
-        )}
-
-        {currentStep === 2 && !isSimplifiedSteps && (
-          <>
-            <PoppinsText
-              style={[styles.purchaseOptionsTitle, styles.step2Title]}
-            >
-              Visualización de datos
-            </PoppinsText>
-            <View style={styles.paymentInfoFormContainer}>
-              <PaymentInfoForm
-                paymentMethod={selectedPayment}
-                total={total.toFixed(2)}
-                onValidationChange={setIsPaymentInfoValid}
-                onBankChange={(value) => console.log('Bank changed:', value)}
-                onReferenceChange={(value) =>
-                  console.log('Reference changed:', value)
-                }
-                onDocumentNumberChange={(value) =>
-                  console.log('Document number changed:', value)
-                }
-                onPhoneChange={(value) => console.log('Phone changed:', value)}
+              <PaymentStatusMessage
+                status={status}
+                orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
+                userName={userName || 'Usuario'}
               />
-            </View>
-          </>
-        )}
-
-        {currentStep === stepsLabels.length && (
-          <>
-            <PoppinsText style={styles.purchaseOptionsTitle}>
-              Confirmación de Orden
-            </PoppinsText>
-            <PaymentStatusMessage
-              status={status}
-              orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
-              userName={userName || 'Usuario'}
-            />
-            <View style={styles.confirmationContainer}>
-              {renderConfirmationContent(status)}
-            </View>
-          </>
-        )}
-
-        <View style={styles.whiteBackgroundContainer}>
-          {currentStep !== 2 && currentStep < stepsLabels.length && (
-            <Coupon
-              onApplyCoupon={(discountAmount) => {
-                setCouponDiscount(discountAmount);
-                setIsCouponApplied(true);
-              }}
-              onCouponApplied={() => setIsCouponApplied(true)}
-            />
+              <View style={styles.confirmationContainer}>
+                {renderConfirmationContent(status)}
+              </View>
+            </>
           )}
-          <OrderSummary />
-          <View style={styles.totalContainer}>
-            {isCouponApplied && (
-              <>
-                <View style={styles.totalRow}>
-                  <PoppinsText style={styles.descuentoLabel}>
-                    Subtotal después del Cupón:
-                  </PoppinsText>
-                  <PoppinsText style={styles.descuentoAmount}>
-                    ${subtotalAfterCoupon.toFixed(2)}
-                  </PoppinsText>
-                </View>
-              </>
+
+          <View style={styles.whiteBackgroundContainer}>
+            {currentStep !== 2 && currentStep < stepsLabels.length && (
+              <Coupon
+                onApplyCoupon={(discountAmount) => {
+                  setCouponDiscount(discountAmount);
+                  setIsCouponApplied(true);
+                }}
+                onCouponApplied={() => setIsCouponApplied(true)}
+              />
             )}
-            <View style={styles.totalRow}>
-              <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
-              <PoppinsText style={styles.descuentoAmount}>
-                +${iva.toFixed(2)}
-              </PoppinsText>
-            </View>
-            <View style={styles.totalRow}>
-              <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-              <PoppinsText style={styles.totalAmount}>
-                ${total.toFixed(2)}
-              </PoppinsText>
+            <OrderSummary />
+            <View style={styles.totalContainer}>
+              {isCouponApplied && (
+                <>
+                  <View style={styles.totalRow}>
+                    <PoppinsText style={styles.descuentoLabel}>
+                      Subtotal después del Cupón:
+                    </PoppinsText>
+                    <PoppinsText style={styles.descuentoAmount}>
+                      ${subtotalAfterCoupon.toFixed(2)}
+                    </PoppinsText>
+                  </View>
+                </>
+              )}
+              <View style={styles.totalRow}>
+                <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
+                <PoppinsText style={styles.descuentoAmount}>
+                  +${iva.toFixed(2)}
+                </PoppinsText>
+              </View>
+              <View style={styles.totalRow}>
+                <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+                <PoppinsText style={styles.totalAmount}>
+                  ${total.toFixed(2)}
+                </PoppinsText>
+              </View>
             </View>
+            <Button
+              title={
+                currentStep === 2 && !isSimplifiedSteps
+                  ? 'Confirmar Pago'
+                  : currentStep < stepsLabels.length
+                    ? 'Continuar'
+                    : 'Volver al Home'
+              }
+              size="medium"
+              style={styles.checkoutButton}
+              variant={'primary'}
+              onPress={handleContinue}
+            />
           </View>
-          <Button
-            title={
-              currentStep === 2 && !isSimplifiedSteps
-                ? 'Confirmar Pago'
-                : currentStep < stepsLabels.length
-                  ? 'Continuar'
-                  : 'Volver al Home'
-            }
-            size="medium"
-            style={styles.checkoutButton}
-            variant={isButtonEnabled ? 'primary' : 'disabled'}
-            onPress={
-              currentStep < stepsLabels.length
-                ? isButtonEnabled
-                  ? handleContinue
-                  : undefined
-                : handleGoToHome
+          <BranchMapModal
+            visible={modalVisible}
+            onClose={() => setModalVisible(false)}
+            branchName={selectedBranch?.name || null}
+            branchCoordinates={
+              selectedBranch
+                ? {
+                    latitude: selectedBranch.latitude,
+                    longitude: selectedBranch.longitude,
+                  }
+                : null
             }
           />
         </View>
-        <BranchMapModal
-          visible={modalVisible}
-          onClose={() => setModalVisible(false)}
-          branchName={selectedBranch?.name || null}
-          branchCoordinates={
-            selectedBranch
-              ? {
-                  latitude: selectedBranch.latitude,
-                  longitude: selectedBranch.longitude,
-                }
-              : null
-          }
-        />
-      </View>
-    </ScrollView>
+      </ScrollView>
+    </>
   );
 };
 

From e90d11c3942092c7b8c071d3e7747a49d1b8b3d8 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 25 Apr 2025 22:22:04 -0400
Subject: [PATCH 153/291] Update LocationSelector to include branch address in
 options and selection logic

---
 src/components/LocationSelector.tsx | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/components/LocationSelector.tsx b/src/components/LocationSelector.tsx
index 046e8a9..b1fade2 100644
--- a/src/components/LocationSelector.tsx
+++ b/src/components/LocationSelector.tsx
@@ -15,6 +15,7 @@ type Branch = {
   name: string;
   latitude: number;
   longitude: number;
+  address: string;
 };
 
 const LocationSelector = ({
@@ -54,6 +55,7 @@ const LocationSelector = ({
             name: branch.name,
             latitude: branch.latitude,
             longitude: branch.longitude,
+            address: branch.address,
           }));
 
           setPickupBranches(branches);
@@ -95,7 +97,7 @@ const LocationSelector = ({
 
   const options =
     selectedOption === 'pickup'
-      ? pickupBranches.map((branch) => branch.name)
+      ? pickupBranches.map((branch) => `${branch.name} - ${branch.address}`)
       : deliveryAddresses.map((item) => item.address);
 
   return (
@@ -114,7 +116,9 @@ const LocationSelector = ({
           options={options}
           placeholder="Selecciona una opción"
           onSelect={(val) => {
-            const branch = pickupBranches.find((b) => b.name === val);
+            const branch = pickupBranches.find(
+              (b) => `${b.name} - ${b.address}` === val,
+            );
             setSelectedBranch(branch || null);
             setSelectedBranchState(branch || null);
             onSelect(branch ? branch.id : null);

From 7c88f1cdb3495a748cece98d1a0f923b63249562 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 25 Apr 2025 22:54:05 -0400
Subject: [PATCH 154/291] Integrate Dropdown component for bank selection in
 PaymentInfoForm and fix validation for payment info in CheckoutScreen

---
 src/components/PaymentInfoForm.tsx | 14 +++++++-------
 src/screens/CheckoutScreen.tsx     |  7 +++++++
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 9492912..27f2331 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -3,6 +3,7 @@ import { View, StyleSheet } from 'react-native';
 import PoppinsText from './PoppinsText';
 import Input from './Input';
 import { FontSizes, Colors } from '../styles/theme';
+import Dropdown from './Dropdown';
 
 const PaymentInfoForm = ({
   paymentMethod,
@@ -126,14 +127,13 @@ const PaymentInfoForm = ({
             Ingrese los datos para validar el pago
           </PoppinsText>
 
-          <Input
+          <Dropdown
             label="Banco"
-            value={bank}
-            placeholder="Ingrese el banco"
-            getValue={setBank}
-            errorText="Este campo no puede estar vacío"
-            validation={(val) => val.trim() !== ''}
-            {...editableInputProps}
+            placeholder="Seleccione el Banco Emisor"
+            options={['Banesco', 'Provincial', 'Mercantil']}
+            onSelect={(val) => setBank(val)}
+            border="default"
+            borderColor={Colors.gray_100}
           />
           <Input
             label="Referencia"
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 0de1d6c..a6349f6 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -164,6 +164,13 @@ const CheckoutScreen = () => {
 
       setCurrentStep(currentStep + 1);
     } else if (currentStep === stepsLabels.length - 1) {
+      // Ensure payment form is valid before creating the order
+      if (!isPaymentInfoValid) {
+        setPopupMessages(['Completar la información de pago correctamente.']);
+        setPopupVisible(true);
+        return;
+      }
+
       // Create the order on the penultimate step
       try {
         if (selectedOption === 'pickup' && !isValidUUID(selectedLocation)) {

From f1d9ca7c5740e0a94c10c8fd4cc59a682f988733 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 25 Apr 2025 23:33:05 -0400
Subject: [PATCH 155/291] Add checkout slice to manage checkout state and
 actions, including coupon handling

---
 src/components/Coupon.tsx         |   2 +-
 src/redux/slices/checkoutSlice.ts |  74 +++++++++++++
 src/redux/store.ts                |   2 +
 src/screens/CheckoutScreen.tsx    | 169 +++++++++++++++---------------
 4 files changed, 163 insertions(+), 84 deletions(-)
 create mode 100644 src/redux/slices/checkoutSlice.ts

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index 947fb63..e7644ef 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -41,7 +41,7 @@ const Coupon: React.FC<CouponProps> = ({
             setValidationMessage('El cupón ha expirado.');
           } else {
             setValidationMessage(
-              `Cupón válido. Se aplicó un descuento de ${discount}$.`,
+              `Cupón válido. Se aplicó un descuento del ${discount}%.`,
             );
             onApplyCoupon(discount);
             onCouponApplied();
diff --git a/src/redux/slices/checkoutSlice.ts b/src/redux/slices/checkoutSlice.ts
new file mode 100644
index 0000000..cfcc694
--- /dev/null
+++ b/src/redux/slices/checkoutSlice.ts
@@ -0,0 +1,74 @@
+// src/redux/slices/checkoutSlice.ts
+import { createSlice, PayloadAction } from '@reduxjs/toolkit';
+
+export type PurchaseOption = 'pickup' | 'delivery' | null;
+export type PaymentOption =
+  | 'punto_de_venta'
+  | 'efectivo'
+  | 'transferencia'
+  | 'pago_movil'
+  | null;
+
+interface CheckoutState {
+  step: number;
+  option: PurchaseOption;
+  payment: PaymentOption;
+  locationId: string | null;
+  paymentInfoValid: boolean;
+  couponDiscount: number;
+  couponApplied: boolean;
+}
+
+const initialState: CheckoutState = {
+  step: 1,
+  option: 'pickup',
+  payment: null,
+  locationId: null,
+  paymentInfoValid: false,
+  couponDiscount: 0,
+  couponApplied: false,
+};
+
+const checkoutSlice = createSlice({
+  name: 'checkout',
+  initialState,
+  reducers: {
+    setStep(state, action: PayloadAction<number>) {
+      state.step = action.payload;
+    },
+    setOption(state, action: PayloadAction<PurchaseOption>) {
+      state.option = action.payload;
+    },
+    setPayment(state, action: PayloadAction<PaymentOption>) {
+      state.payment = action.payload;
+    },
+    setLocationId(state, action: PayloadAction<string | null>) {
+      state.locationId = action.payload;
+    },
+    setPaymentInfoValid(state, action: PayloadAction<boolean>) {
+      state.paymentInfoValid = action.payload;
+    },
+    setCouponDiscount(state, action: PayloadAction<number>) {
+      state.couponDiscount = action.payload;
+    },
+    setCouponApplied(state, action: PayloadAction<boolean>) {
+      state.couponApplied = action.payload;
+    },
+    resetCheckout(state) {
+      Object.assign(state, initialState);
+    },
+  },
+});
+
+export const {
+  setStep,
+  setOption,
+  setPayment,
+  setLocationId,
+  setPaymentInfoValid,
+  setCouponDiscount,
+  setCouponApplied,
+  resetCheckout,
+} = checkoutSlice.actions;
+
+export default checkoutSlice.reducer;
diff --git a/src/redux/store.ts b/src/redux/store.ts
index e3b4670..c0eb398 100644
--- a/src/redux/store.ts
+++ b/src/redux/store.ts
@@ -1,11 +1,13 @@
 import { configureStore } from '@reduxjs/toolkit';
 import cartReducer from './slices/cartSlice'; // Importa el reducer del carrito
 import deliveryReducer from './slices/deliverySlice'; // Importa el reducer de entrega
+import checkoutReducer from './slices/checkoutSlice';
 
 export const store = configureStore({
   reducer: {
     cart: cartReducer, // Conecta el slice del carrito
     delivery: deliveryReducer,
+    checkout: checkoutReducer,
   },
   devTools: true, // Habilita Redux DevTools
 });
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index a6349f6..64cdf14 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -30,27 +30,37 @@ import { OrderService } from '../services/order';
 import { UserService } from '../services/user';
 import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
-import { useDispatch } from 'react-redux';
+import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
 import { useFocusEffect } from '@react-navigation/native';
 import Popup from '../components/Popup'; // Import the Popup component
+import { RootState, AppDispatch } from '../redux/store';
+import {
+  setStep,
+  setOption,
+  setPayment,
+  setLocationId,
+  setPaymentInfoValid,
+  resetCheckout,
+  setCouponDiscount,
+  setCouponApplied,
+} from '../redux/slices/checkoutSlice';
 
 const CheckoutScreen = () => {
+  const dispatch = useDispatch<AppDispatch>();
+  const {
+    step,
+    option,
+    payment,
+    locationId,
+    paymentInfoValid,
+    couponDiscount,
+    couponApplied,
+  } = useSelector((state: RootState) => state.checkout);
+
   const router = useRouter();
-  const dispatch = useDispatch();
   const { cartItems } = useCart();
-  const [selectedOption, setSelectedOption] = useState<
-    'pickup' | 'delivery' | null
-  >('pickup');
-  const [selectedPayment, setSelectedPayment] = useState<
-    'punto_de_venta' | 'efectivo' | 'transferencia' | 'pago_movil' | null
-  >(null);
-  const [selectedLocation, setSelectedLocation] = useState<string | null>(null);
-  const [currentStep, setCurrentStep] = useState(1);
   const [status, setStatus] = useState<'approved' | 'rejected'>('approved');
-  const [isPaymentInfoValid, setIsPaymentInfoValid] = useState(false);
-  const [couponDiscount, setCouponDiscount] = useState(0);
-  const [isCouponApplied, setIsCouponApplied] = useState(false);
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [userName, setUserName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
@@ -83,7 +93,7 @@ const CheckoutScreen = () => {
   useFocusEffect(
     React.useCallback(() => {
       const onBackPress = () => {
-        if (currentStep === stepsLabels.length) {
+        if (step === stepsLabels.length) {
           // Limpiar el carrito si el usuario está en el último paso
           dispatch(clearCart());
         }
@@ -94,12 +104,12 @@ const CheckoutScreen = () => {
 
       return () =>
         BackHandler.removeEventListener('hardwareBackPress', onBackPress);
-    }, [currentStep]),
+    }, [step]),
   );
 
   const isSimplifiedSteps =
-    (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') ||
-    (selectedOption === 'delivery' && selectedPayment === 'efectivo');
+    (option === 'pickup' && payment === 'punto_de_venta') ||
+    (option === 'delivery' && payment === 'efectivo');
 
   const stepsLabels = isSimplifiedSteps
     ? ['Opciones de Compra', 'Confirmación de orden']
@@ -114,17 +124,17 @@ const CheckoutScreen = () => {
     0,
   );
   const subtotalAfterDiscount = subtotal - totalDiscount;
-  const subtotalAfterCoupon = isCouponApplied
-    ? subtotalAfterDiscount - couponDiscount
+  const subtotalAfterCoupon = couponApplied
+    ? subtotalAfterDiscount * (1 - couponDiscount / 100)
     : subtotalAfterDiscount;
   const iva = subtotalAfterCoupon * 0.16;
   const total = subtotalAfterCoupon + iva;
 
   const renderFooterMessage = () => {
-    if (selectedOption === 'pickup' && selectedPayment === 'punto_de_venta') {
+    if (option === 'pickup' && payment === 'punto_de_venta') {
       return 'Por favor dirigirse a su sucursal más cercana y pagar en el sitio. La orden estará en proceso de pago hasta que pague en el sitio.';
     }
-    if (selectedOption === 'delivery' && selectedPayment === 'efectivo') {
+    if (option === 'delivery' && payment === 'efectivo') {
       return 'Debe pagar al personal del delivery la cantidad exacta de su pedido. La orden estará en proceso de pago hasta que pague en el sitio.';
     }
     return null;
@@ -139,20 +149,14 @@ const CheckoutScreen = () => {
   const handleContinue = async () => {
     const missingFields: string[] = [];
 
-    if (currentStep < stepsLabels.length - 1) {
+    if (step < stepsLabels.length - 1) {
       // Validation for steps before the confirmation step
-      if (currentStep === 1) {
-        if (!selectedOption)
-          missingFields.push('Seleccionar una opción de compra.');
-        if (!selectedLocation)
+      if (step === 1) {
+        if (!option) missingFields.push('Seleccionar una opción de compra.');
+        if (!locationId)
           missingFields.push('Seleccionar una opción de locación.');
-        if (!selectedPayment)
-          missingFields.push('Seleccionar un método de pago.');
-      } else if (
-        currentStep === 2 &&
-        !isSimplifiedSteps &&
-        !isPaymentInfoValid
-      ) {
+        if (!payment) missingFields.push('Seleccionar un método de pago.');
+      } else if (step === 2 && !isSimplifiedSteps && !paymentInfoValid) {
         missingFields.push('Completar la información de pago.');
       }
 
@@ -162,10 +166,10 @@ const CheckoutScreen = () => {
         return;
       }
 
-      setCurrentStep(currentStep + 1);
-    } else if (currentStep === stepsLabels.length - 1) {
+      dispatch(setStep(step + 1));
+    } else if (step === stepsLabels.length - 1) {
       // Ensure payment form is valid before creating the order
-      if (!isPaymentInfoValid) {
+      if (!paymentInfoValid) {
         setPopupMessages(['Completar la información de pago correctamente.']);
         setPopupVisible(true);
         return;
@@ -173,19 +177,19 @@ const CheckoutScreen = () => {
 
       // Create the order on the penultimate step
       try {
-        if (selectedOption === 'pickup' && !isValidUUID(selectedLocation)) {
+        if (option === 'pickup' && !isValidUUID(locationId)) {
           setErrorMessage('La sucursal seleccionada no es válida.');
           setStatus('rejected');
           return;
         }
 
-        if (selectedOption === 'delivery' && !isValidUUID(selectedLocation)) {
+        if (option === 'delivery' && !isValidUUID(locationId)) {
           setErrorMessage('La dirección seleccionada no es válida.');
           setStatus('rejected');
           return;
         }
 
-        if (!selectedOption) {
+        if (!option) {
           setErrorMessage('Debe seleccionar una opción de compra.');
           setStatus('rejected');
           return;
@@ -213,16 +217,10 @@ const CheckoutScreen = () => {
 
         // Construir el payload de la orden
         const orderPayload: CreateOrder = {
-          type:
-            selectedOption === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
-          branchId:
-            selectedOption === 'pickup'
-              ? selectedLocation || undefined
-              : undefined,
+          type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
+          branchId: option === 'pickup' ? locationId || undefined : undefined,
           userAddressId:
-            selectedOption === 'delivery'
-              ? selectedLocation || undefined
-              : undefined,
+            option === 'delivery' ? locationId || undefined : undefined,
           products,
         };
 
@@ -250,15 +248,16 @@ const CheckoutScreen = () => {
         console.log('Orden creada exitosamente:', orderResponse);
 
         setStatus('approved');
-        setCurrentStep(currentStep + 1); // Move to the confirmation step
+        dispatch(setStep(step + 1)); // Move to the confirmation step
       } catch (error) {
         console.error('Error al procesar la orden:', error);
         setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
         setStatus('rejected');
       }
-    } else if (currentStep === stepsLabels.length) {
+    } else if (step === stepsLabels.length) {
       // Limpiar el carrito al salir del flujo de checkout
       dispatch(clearCart());
+      dispatch(resetCheckout());
       router.dismissAll();
       router.replace({
         pathname: '/(tabs)',
@@ -267,15 +266,15 @@ const CheckoutScreen = () => {
   };
 
   const handleGoBack = () => {
-    if (currentStep === stepsLabels.length) {
+    if (step === stepsLabels.length) {
       // Si estamos en el último paso, no permitir retroceder
       return;
     }
 
-    if (currentStep === 1) {
+    if (step === 1) {
       router.back();
-    } else if (currentStep > 1) {
-      setCurrentStep(currentStep - 1);
+    } else if (step > 1) {
+      dispatch(setStep(step - 1));
     }
   };
 
@@ -288,7 +287,7 @@ const CheckoutScreen = () => {
   };
 
   const renderConfirmationContent = (status: 'approved' | 'rejected') => {
-    if (selectedOption === 'pickup' && status === 'approved') {
+    if (option === 'pickup' && status === 'approved') {
       return (
         <>
           <PoppinsText style={styles.confirmationMessage}>
@@ -312,7 +311,7 @@ const CheckoutScreen = () => {
       );
     }
 
-    if (selectedOption === 'delivery' && status === 'approved') {
+    if (option === 'delivery' && status === 'approved') {
       return (
         <>
           <PoppinsText style={styles.confirmationMessage}>
@@ -353,6 +352,11 @@ const CheckoutScreen = () => {
     return null;
   };
 
+  const handleApplyCoupon = (discountAmount: number) => {
+    dispatch(setCouponDiscount(discountAmount));
+    dispatch(setCouponApplied(true));
+  };
+
   return (
     <>
       <Popup
@@ -370,7 +374,7 @@ const CheckoutScreen = () => {
       />
       <ScrollView contentContainerStyle={styles.scrollContainer}>
         <View style={styles.container}>
-          {currentStep < stepsLabels.length && (
+          {step < stepsLabels.length && (
             <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
               <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
             </TouchableOpacity>
@@ -380,7 +384,7 @@ const CheckoutScreen = () => {
             <Animated.View style={{ opacity: 1 }}>
               <Steps
                 totalSteps={stepsLabels.length}
-                currentStep={currentStep}
+                currentStep={step}
                 labels={stepsLabels}
               />
             </Animated.View>
@@ -392,7 +396,7 @@ const CheckoutScreen = () => {
             </PoppinsText>
           )}
 
-          {currentStep === 1 && (
+          {step === 1 && (
             <>
               <PoppinsText style={styles.purchaseOptionsTitle}>
                 Opciones de Compra
@@ -402,10 +406,10 @@ const CheckoutScreen = () => {
                   <RadioCard
                     label="Retiro en Sucursal"
                     icon={<ShoppingBagIcon color={Colors.textMain} />}
-                    selected={selectedOption === 'pickup'}
+                    selected={option === 'pickup'}
                     onPress={() => {
-                      setSelectedOption('pickup');
-                      setSelectedLocation(null);
+                      dispatch(setOption('pickup'));
+                      dispatch(setLocationId(null));
                     }}
                   />
                 </View>
@@ -413,24 +417,24 @@ const CheckoutScreen = () => {
                   <RadioCard
                     label="Delivery"
                     icon={<TruckIcon color={Colors.textMain} />}
-                    selected={selectedOption === 'delivery'}
+                    selected={option === 'delivery'}
                     onPress={() => {
-                      setSelectedOption('delivery');
-                      setSelectedLocation(null);
+                      dispatch(setOption('delivery'));
+                      dispatch(setLocationId(null));
                     }}
                   />
                 </View>
               </View>
               <LocationSelector
-                selectedOption={selectedOption || 'pickup'}
-                onSelect={(val) => setSelectedLocation(val)}
+                selectedOption={option || 'pickup'}
+                onSelect={(val) => dispatch(setLocationId(val))}
                 setSelectedBranch={setSelectedBranch}
               />
               <View style={styles.paymentMethods}>
                 <PaymentMethods
-                  selectedOption={selectedOption}
-                  selectedPayment={selectedPayment}
-                  setSelectedPayment={setSelectedPayment}
+                  selectedOption={option}
+                  selectedPayment={payment}
+                  setSelectedPayment={(val) => dispatch(setPayment(val))}
                 />
               </View>
               {renderFooterMessage() && (
@@ -441,7 +445,7 @@ const CheckoutScreen = () => {
             </>
           )}
 
-          {currentStep === 2 && !isSimplifiedSteps && (
+          {step === 2 && !isSimplifiedSteps && (
             <>
               <PoppinsText
                 style={[styles.purchaseOptionsTitle, styles.step2Title]}
@@ -450,9 +454,11 @@ const CheckoutScreen = () => {
               </PoppinsText>
               <View style={styles.paymentInfoFormContainer}>
                 <PaymentInfoForm
-                  paymentMethod={selectedPayment}
+                  paymentMethod={payment}
                   total={total.toFixed(2)}
-                  onValidationChange={setIsPaymentInfoValid}
+                  onValidationChange={(isValid) =>
+                    dispatch(setPaymentInfoValid(isValid))
+                  }
                   onBankChange={(value) => console.log('Bank changed:', value)}
                   onReferenceChange={(value) =>
                     console.log('Reference changed:', value)
@@ -468,7 +474,7 @@ const CheckoutScreen = () => {
             </>
           )}
 
-          {currentStep === stepsLabels.length && (
+          {step === stepsLabels.length && (
             <>
               <PoppinsText style={styles.purchaseOptionsTitle}>
                 Confirmación de Orden
@@ -485,18 +491,15 @@ const CheckoutScreen = () => {
           )}
 
           <View style={styles.whiteBackgroundContainer}>
-            {currentStep !== 2 && currentStep < stepsLabels.length && (
+            {step !== 2 && step < stepsLabels.length && (
               <Coupon
-                onApplyCoupon={(discountAmount) => {
-                  setCouponDiscount(discountAmount);
-                  setIsCouponApplied(true);
-                }}
-                onCouponApplied={() => setIsCouponApplied(true)}
+                onApplyCoupon={handleApplyCoupon}
+                onCouponApplied={() => dispatch(setCouponApplied(true))}
               />
             )}
             <OrderSummary />
             <View style={styles.totalContainer}>
-              {isCouponApplied && (
+              {couponApplied && (
                 <>
                   <View style={styles.totalRow}>
                     <PoppinsText style={styles.descuentoLabel}>
@@ -523,9 +526,9 @@ const CheckoutScreen = () => {
             </View>
             <Button
               title={
-                currentStep === 2 && !isSimplifiedSteps
+                step === 2 && !isSimplifiedSteps
                   ? 'Confirmar Pago'
-                  : currentStep < stepsLabels.length
+                  : step < stepsLabels.length
                     ? 'Continuar'
                     : 'Volver al Home'
               }

From bce88485ca9bc2470fdd721d2bf7043860ae7de6 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 26 Apr 2025 10:16:28 -0400
Subject: [PATCH 156/291] Enhance coupon functionality by integrating last
 applied coupon state management and improving validation logic

---
 src/components/Coupon.tsx         | 93 ++++++++++++++++++-------------
 src/redux/slices/checkoutSlice.ts |  6 ++
 2 files changed, 60 insertions(+), 39 deletions(-)

diff --git a/src/components/Coupon.tsx b/src/components/Coupon.tsx
index e7644ef..2d98bcb 100644
--- a/src/components/Coupon.tsx
+++ b/src/components/Coupon.tsx
@@ -1,10 +1,18 @@
+// src/components/Coupon.tsx
 import React, { useState } from 'react';
 import { View, StyleSheet } from 'react-native';
 import Input from './Input';
 import Button from './Button';
-import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
+import { Colors, FontSizes } from '../styles/theme';
 import { CouponService } from '../services/coupon';
+import { useDispatch, useSelector } from 'react-redux';
+import { RootState } from '../redux/store';
+import {
+  setCouponDiscount,
+  setCouponApplied,
+  setLastAppliedCoupon,
+} from '../redux/slices/checkoutSlice';
 
 interface CouponProps {
   onApplyCoupon: (discount: number) => void;
@@ -12,53 +20,57 @@ interface CouponProps {
   isLoading?: boolean;
 }
 
-const Coupon: React.FC<CouponProps> = ({
-  onApplyCoupon,
-  onCouponApplied,
-  isLoading = false,
-}) => {
-  const [couponCode, setCouponCode] = useState('');
+const Coupon: React.FC<CouponProps> = ({ isLoading = false }) => {
+  const dispatch = useDispatch();
+  const lastAppliedCoupon = useSelector(
+    (state: RootState) => state.checkout.lastAppliedCoupon,
+  );
+
+  const [couponCode, setCouponCode] = useState(lastAppliedCoupon || '');
   const [validationMessage, setValidationMessage] = useState<string | null>(
     null,
   );
   const [loading, setLoading] = useState(false);
 
   const handleApply = async () => {
-    if (couponCode.trim().length > 0) {
-      setLoading(true);
-      setValidationMessage(null);
-
-      try {
-        // Llamar al servicio para validar el cupón
-        const response = await CouponService.validateCoupon(couponCode.trim());
+    const code = couponCode.trim();
+    if (!code) return;
 
-        // Manejar la respuesta del servicio
-        if (response) {
-          const { discount, expirationDate } = response;
-          const isExpired = new Date(expirationDate) < new Date();
+    setLoading(true);
+    setValidationMessage(null);
 
-          if (isExpired) {
-            setValidationMessage('El cupón ha expirado.');
-          } else {
-            setValidationMessage(
-              `Cupón válido. Se aplicó un descuento del ${discount}%.`,
-            );
-            onApplyCoupon(discount);
-            onCouponApplied();
-          }
-        } else {
-          setValidationMessage('Cupón inválido.');
-        }
-      } catch (error) {
+    try {
+      const response = await CouponService.validateCoupon(code);
+      const { discount, expirationDate } = response;
+      if (new Date(expirationDate) < new Date()) {
+        setValidationMessage('El cupón ha expirado.');
+      } else {
+        setValidationMessage(
+          `Cupón válido. Se aplicó ${discount}% de descuento.`,
+        );
+        dispatch(setCouponDiscount(discount));
+        dispatch(setCouponApplied(true));
+        dispatch(setLastAppliedCoupon(code));
+      }
+    } catch (err: unknown) {
+      const msg = (err instanceof Error && err.message.toLowerCase?.()) ?? '';
+      if (
+        typeof msg === 'string' &&
+        (msg.includes('not found') || msg.includes('no encontrado'))
+      ) {
+        setValidationMessage('Cupón inválido.');
+      } else {
         setValidationMessage('Error al validar el cupón.');
-        console.error('Error en handleApply:', error);
-      } finally {
-        setLoading(false);
+        console.error('Error en validateCoupon:', err);
       }
+    } finally {
+      setLoading(false);
     }
   };
 
-  const isButtonDisabled = couponCode.trim().length === 0 || loading;
+  const handleChange = (text: string) => {
+    setCouponCode(text);
+  };
 
   return (
     <View style={styles.container}>
@@ -68,26 +80,29 @@ const Coupon: React.FC<CouponProps> = ({
           <Input
             placeholder="Código de Cupón"
             value={couponCode}
-            getValue={(text) => setCouponCode(text)}
+            getValue={handleChange}
             border="none"
             backgroundColor="none"
           />
         </View>
         <Button
-          title="Aplicar"
+          title={
+            couponCode.trim() === lastAppliedCoupon ? 'Aplicado' : 'Aplicar'
+          }
           onPress={handleApply}
-          variant={isButtonDisabled ? 'disabled' : 'primary'}
+          variant={loading || isLoading ? 'disabled' : 'primary'}
           size="medium"
           loading={loading || isLoading}
           style={styles.button}
         />
       </View>
+
       {validationMessage && (
         <PoppinsText
           style={[
             styles.validationMessage,
             {
-              color: validationMessage.includes('Cupón válido')
+              color: validationMessage.includes('válido')
                 ? Colors.semanticSuccess
                 : Colors.semanticDanger,
             },
diff --git a/src/redux/slices/checkoutSlice.ts b/src/redux/slices/checkoutSlice.ts
index cfcc694..7d41542 100644
--- a/src/redux/slices/checkoutSlice.ts
+++ b/src/redux/slices/checkoutSlice.ts
@@ -17,6 +17,7 @@ interface CheckoutState {
   paymentInfoValid: boolean;
   couponDiscount: number;
   couponApplied: boolean;
+  lastAppliedCoupon: string | null; // Add a field to store the last applied coupon code
 }
 
 const initialState: CheckoutState = {
@@ -27,6 +28,7 @@ const initialState: CheckoutState = {
   paymentInfoValid: false,
   couponDiscount: 0,
   couponApplied: false,
+  lastAppliedCoupon: null,
 };
 
 const checkoutSlice = createSlice({
@@ -54,6 +56,9 @@ const checkoutSlice = createSlice({
     setCouponApplied(state, action: PayloadAction<boolean>) {
       state.couponApplied = action.payload;
     },
+    setLastAppliedCoupon(state, action: PayloadAction<string | null>) {
+      state.lastAppliedCoupon = action.payload;
+    },
     resetCheckout(state) {
       Object.assign(state, initialState);
     },
@@ -68,6 +73,7 @@ export const {
   setPaymentInfoValid,
   setCouponDiscount,
   setCouponApplied,
+  setLastAppliedCoupon,
   resetCheckout,
 } = checkoutSlice.actions;
 

From 32ee278eec538b7c28c2d1664ced4e5ca13e6503 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 26 Apr 2025 12:20:40 -0400
Subject: [PATCH 157/291] Changes to eas.json and adding it in gitignore

---
 .gitignore |  5 ++++-
 eas.json   | 12 ++++++++++--
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/.gitignore b/.gitignore
index c252908..71c3fbc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -129,4 +129,7 @@ docs/pages/versions/*/react-native/*.diff
 !crsqlite.xcframework
 
 # iOS
-**/ios/.xcode.env.local
\ No newline at end of file
+**/ios/.xcode.env.local
+
+
+eas.json
\ No newline at end of file
diff --git a/eas.json b/eas.json
index bbf20f3..46fd72c 100644
--- a/eas.json
+++ b/eas.json
@@ -5,12 +5,20 @@
         "buildType": "apk"
       },
       "env": {
-        "PHARMATECH_DEV_MODE": "true"
+        "PHARMATECH_DEV_MODE": "true",
+        "GOOGLE_MAPS_API_KEY": "AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w",
+        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
+        "CLOUDINARY_API_KEY": "281941874694529",
+        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
       }
     },
     "production": {
       "env": {
-        "PHARMATECH_DEV_MODE": "false"
+        "PHARMATECH_DEV_MODE": "false",
+        "GOOGLE_MAPS_API_KEY": "AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w",
+        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
+        "CLOUDINARY_API_KEY": "281941874694529",
+        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
       }
     }
   }

From f8b6f4c9b6ce063bef6c8ea3c43d3a1b7daf52e9 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 26 Apr 2025 13:41:53 -0400
Subject: [PATCH 158/291] Add bank selection validation and improve input error
 handling in PaymentInfoForm

---
 src/components/PaymentInfoForm.tsx | 34 ++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 27f2331..3fb2893 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -28,6 +28,7 @@ const PaymentInfoForm = ({
   onPhoneChange: (value: string) => void;
 }) => {
   const [bank, setBank] = useState('');
+  const [hasBankTouched, setHasBankTouched] = useState(false);
   const [reference, setReference] = useState('');
   const [documentNumber, setDocumentNumber] = useState('');
   const [phone, setPhone] = useState('');
@@ -131,10 +132,29 @@ const PaymentInfoForm = ({
             label="Banco"
             placeholder="Seleccione el Banco Emisor"
             options={['Banesco', 'Provincial', 'Mercantil']}
-            onSelect={(val) => setBank(val)}
+            onSelect={(val) => {
+              setBank(val);
+              setHasBankTouched(true);
+            }}
             border="default"
-            borderColor={Colors.gray_100}
+            borderColor={
+              hasBankTouched && bank === ''
+                ? Colors.semanticDanger
+                : Colors.gray_100
+            }
           />
+          {hasBankTouched && bank === '' && (
+            <PoppinsText
+              style={{
+                color: Colors.semanticDanger,
+                fontSize: FontSizes.label.size,
+                marginTop: 4,
+              }}
+            >
+              Debe seleccionar un banco
+            </PoppinsText>
+          )}
+
           <Input
             label="Referencia"
             value={reference}
@@ -143,6 +163,8 @@ const PaymentInfoForm = ({
             fieldType="number"
             errorText="Debe ser un número válido"
             validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
+            showIcon
+            useDefaultValidation={false}
             {...editableInputProps}
           />
           <Input
@@ -153,8 +175,10 @@ const PaymentInfoForm = ({
               setDocumentNumber(val.replace(/\D/g, '').slice(0, 8))
             }
             fieldType="number"
-            errorText="Debe contener hasta 8 dígitos numéricos"
-            validation={(val) => /^\d{1,8}$/.test(val)}
+            errorText="El campo no debe estar vacío"
+            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
+            showIcon
+            useDefaultValidation={false}
             {...editableInputProps}
           />
           <Input
@@ -165,6 +189,8 @@ const PaymentInfoForm = ({
             fieldType="number"
             errorText="Debe tener exactamente 11 dígitos"
             validation={(val) => /^\d{11}$/.test(val)}
+            showIcon
+            useDefaultValidation={false}
             {...editableInputProps}
           />
         </>

From 7d2f43dbd17ffbd0ce4c05a9b7e320e8d647884a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 26 Apr 2025 14:04:04 -0400
Subject: [PATCH 159/291] Fixing the way maps use the key

---
 eas.json                             | 4 ++--
 src/components/DeliveryMap.tsx       | 3 ++-
 src/components/HistoryMap.tsx        | 3 ++-
 src/config.ts                        | 6 ++++++
 src/screens/SelectLocationScreen.tsx | 3 ++-
 src/types/env.d.ts                   | 4 ++++
 6 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 src/config.ts

diff --git a/eas.json b/eas.json
index 46fd72c..14c9e21 100644
--- a/eas.json
+++ b/eas.json
@@ -6,7 +6,7 @@
       },
       "env": {
         "PHARMATECH_DEV_MODE": "true",
-        "GOOGLE_MAPS_API_KEY": "AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w",
+        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
         "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
         "CLOUDINARY_API_KEY": "281941874694529",
         "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
@@ -15,7 +15,7 @@
     "production": {
       "env": {
         "PHARMATECH_DEV_MODE": "false",
-        "GOOGLE_MAPS_API_KEY": "AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w",
+        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
         "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
         "CLOUDINARY_API_KEY": "281941874694529",
         "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index a83f6df..c987c23 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -2,6 +2,7 @@ import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
 import { StyleSheet, View, Alert } from 'react-native';
 import * as Location from 'expo-location';
+import { Config } from '../config';
 
 interface DeliveryMapProps {
   deliveryState: number;
@@ -80,7 +81,7 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   ) => {
     try {
       const response = await fetch(
-        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
+        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=${Config.googleMapsApiKey}`,
       );
       const data = await response.json();
 
diff --git a/src/components/HistoryMap.tsx b/src/components/HistoryMap.tsx
index ca16d8d..7a0b0d7 100644
--- a/src/components/HistoryMap.tsx
+++ b/src/components/HistoryMap.tsx
@@ -1,6 +1,7 @@
 import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
 import { StyleSheet, View, Alert } from 'react-native';
+import { Config } from '../config';
 
 interface HistoryMapProps {
   deliveryLocation: { latitude: number; longitude: number };
@@ -62,7 +63,7 @@ const HistoryMap: React.FC<HistoryMapProps> = ({
   ) => {
     try {
       const response = await fetch(
-        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
+        `https://maps.googleapis.com/maps/api/directions/json?origin=${originLat},${originLng}&destination=${destLat},${destLng}&key=${Config.googleMapsApiKey}`,
       );
       const data = await response.json();
 
diff --git a/src/config.ts b/src/config.ts
new file mode 100644
index 0000000..9e75f04
--- /dev/null
+++ b/src/config.ts
@@ -0,0 +1,6 @@
+import { PHARMATECH_DEV_MODE, GOOGLE_MAPS_API_KEY } from '@env';
+
+export const Config = {
+  isDevelopment: PHARMATECH_DEV_MODE === 'true',
+  googleMapsApiKey: GOOGLE_MAPS_API_KEY,
+};
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index d38093d..8cd08ad 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -7,6 +7,7 @@ import Button from '../components/Button';
 import { MapPinIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
+import { Config } from '../config';
 
 const SelectLocationScreen = () => {
   const [selectedLocation, setSelectedLocation] = useState<{
@@ -76,7 +77,7 @@ const SelectLocationScreen = () => {
   const fetchAddress = async (latitude: number, longitude: number) => {
     try {
       const response = await fetch(
-        `https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&key=AIzaSyC172ukD655b-4H1m1bC3xQ7g1sHFxMP_w`,
+        `https://maps.googleapis.com/maps/api/geocode/json?latlng=${latitude},${longitude}&key=${Config.googleMapsApiKey}`,
       );
       const data = await response.json();
 
diff --git a/src/types/env.d.ts b/src/types/env.d.ts
index da78325..6c71cff 100644
--- a/src/types/env.d.ts
+++ b/src/types/env.d.ts
@@ -1,3 +1,7 @@
 declare module '@env' {
   export const PHARMATECH_DEV_MODE: string;
+  export const GOOGLE_MAPS_API_KEY: string;
+  export const NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME: string;
+  export const CLOUDINARY_API_KEY: string;
+  export const CLOUDINARY_API_SECRET: string;
 }

From bba4f41c8d7ece3bc6178f74eb6992ce92044f32 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 26 Apr 2025 15:13:05 -0400
Subject: [PATCH 160/291] Back button fix

---
 src/app/_layout.tsx                       | 12 ++++++++++--
 src/app/deliveryDetail/_layout.tsx        | 12 ++++++++++--
 src/app/deliveryHistoryDetail/_layout.tsx | 12 ++++++++++--
 src/screens/CheckoutScreen.tsx            |  6 ++++--
 src/screens/PasswordRecoveryScreen.tsx    | 24 +++++++++++++++++++----
 src/screens/ProductDetailScreen.tsx       |  4 ++--
 src/screens/RegisterScreen.tsx            | 24 +++++++++++++++++++----
 7 files changed, 76 insertions(+), 18 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 45edad1..58573c9 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -55,8 +55,16 @@ export default function RootLayout() {
           headerBackVisible: false,
           headerLeft: () =>
             navigation.canGoBack() ? (
-              <TouchableOpacity onPress={navigation.goBack}>
-                <ChevronLeftIcon width={24} height={24} color="#000" />
+              <TouchableOpacity
+                onPress={navigation.goBack}
+                style={{
+                  padding: 12, // Aumentado
+                  marginLeft: -12,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon width={28} height={28} color="#000" />
               </TouchableOpacity>
             ) : null,
           headerBackTitleVisible: false,
diff --git a/src/app/deliveryDetail/_layout.tsx b/src/app/deliveryDetail/_layout.tsx
index d387e61..2fe1a7e 100644
--- a/src/app/deliveryDetail/_layout.tsx
+++ b/src/app/deliveryDetail/_layout.tsx
@@ -13,8 +13,16 @@ export default function DeliveryDetailLayout() {
         headerLeft: () =>
           navigation.canGoBack() ? (
             <View style={styles.iconContainer}>
-              <TouchableOpacity onPress={navigation.goBack}>
-                <ChevronLeftIcon width={24} height={24} color="#000" />
+              <TouchableOpacity
+                onPress={navigation.goBack}
+                style={{
+                  padding: 12, // Aumentado
+                  marginLeft: -12,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon width={28} height={28} color="#000" />
               </TouchableOpacity>
             </View>
           ) : null,
diff --git a/src/app/deliveryHistoryDetail/_layout.tsx b/src/app/deliveryHistoryDetail/_layout.tsx
index d387e61..2fe1a7e 100644
--- a/src/app/deliveryHistoryDetail/_layout.tsx
+++ b/src/app/deliveryHistoryDetail/_layout.tsx
@@ -13,8 +13,16 @@ export default function DeliveryDetailLayout() {
         headerLeft: () =>
           navigation.canGoBack() ? (
             <View style={styles.iconContainer}>
-              <TouchableOpacity onPress={navigation.goBack}>
-                <ChevronLeftIcon width={24} height={24} color="#000" />
+              <TouchableOpacity
+                onPress={navigation.goBack}
+                style={{
+                  padding: 12, // Aumentado
+                  marginLeft: -12,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon width={28} height={28} color="#000" />
               </TouchableOpacity>
             </View>
           ) : null,
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 6da0b6a..b07078e 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -348,7 +348,7 @@ const CheckoutScreen = () => {
       <View style={styles.container}>
         {currentStep < stepsLabels.length && (
           <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
+            <ChevronLeftIcon width={28} height={28} color={Colors.textMain} />
           </TouchableOpacity>
         )}
 
@@ -544,7 +544,9 @@ const styles = StyleSheet.create({
     top: 16,
     left: 16,
     zIndex: 1,
-    padding: 8,
+    padding: 12,
+    marginLeft: -12,
+    marginTop: -8,
   },
   steps: {
     marginTop: 60,
diff --git a/src/screens/PasswordRecoveryScreen.tsx b/src/screens/PasswordRecoveryScreen.tsx
index 9c1fe95..11537be 100644
--- a/src/screens/PasswordRecoveryScreen.tsx
+++ b/src/screens/PasswordRecoveryScreen.tsx
@@ -29,16 +29,32 @@ export default function PasswordRecoveryScreen() {
     if (currentStep === 1) {
       navigation.setOptions({
         headerLeft: () => (
-          <TouchableOpacity onPress={() => navigation.goBack()}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.primary} />
+          <TouchableOpacity
+            onPress={() => navigation.goBack()}
+            style={{
+              padding: 12, // Aumentado
+              marginLeft: -12,
+              flexDirection: 'row',
+              alignItems: 'center',
+            }}
+          >
+            <ChevronLeftIcon width={28} height={28} color={Colors.primary} />
           </TouchableOpacity>
         ),
       });
     } else {
       navigation.setOptions({
         headerLeft: () => (
-          <TouchableOpacity onPress={() => handleStepChange(currentStep - 1)}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.primary} />
+          <TouchableOpacity
+            onPress={() => handleStepChange(currentStep - 1)}
+            style={{
+              padding: 12, // Aumentado
+              marginLeft: -12,
+              flexDirection: 'row',
+              alignItems: 'center',
+            }}
+          >
+            <ChevronLeftIcon width={28} height={28} color={Colors.primary} />
           </TouchableOpacity>
         ),
       });
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 391d8ce..d7878d8 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -263,8 +263,8 @@ const ProductDetailScreen: React.FC = () => {
         }}
       >
         <ChevronLeftIcon
-          width={16}
-          height={16}
+          width={20}
+          height={20}
           color={Colors.primary}
           style={{ marginRight: 2, marginLeft: 6 }} // Espacio entre el ícono y el texto
         />
diff --git a/src/screens/RegisterScreen.tsx b/src/screens/RegisterScreen.tsx
index c255a48..d233bc0 100644
--- a/src/screens/RegisterScreen.tsx
+++ b/src/screens/RegisterScreen.tsx
@@ -59,16 +59,32 @@ export default function RegisterScreen() {
     if (currentStep === 2) {
       navigation.setOptions({
         headerLeft: () => (
-          <TouchableOpacity onPress={() => handleStepChange(1)}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.primary} />
+          <TouchableOpacity
+            onPress={() => handleStepChange(1)}
+            style={{
+              padding: 12, // Aumentado
+              marginLeft: -12,
+              flexDirection: 'row',
+              alignItems: 'center',
+            }}
+          >
+            <ChevronLeftIcon width={28} height={28} color={Colors.primary} />
           </TouchableOpacity>
         ),
       });
     } else if (currentStep === 1) {
       navigation.setOptions({
         headerLeft: () => (
-          <TouchableOpacity onPress={() => router.replace('/login')}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.primary} />
+          <TouchableOpacity
+            onPress={() => router.replace('/login')}
+            style={{
+              padding: 12, // Aumentado
+              marginLeft: -12,
+              flexDirection: 'row',
+              alignItems: 'center',
+            }}
+          >
+            <ChevronLeftIcon width={28} height={28} color={Colors.primary} />
           </TouchableOpacity>
         ),
       });

From a903a3975689f6bc7ca42a26f7dcd95924862a08 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 26 Apr 2025 15:56:29 -0400
Subject: [PATCH 161/291] Adding activity indicators to some screens

---
 src/screens/OrderDetailScreen.tsx |  25 ++++-
 src/screens/OrdersScreen.tsx      |  27 +++++-
 src/screens/tab/HomeScreen.tsx    | 152 ++++++++++++++++--------------
 3 files changed, 128 insertions(+), 76 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 5f33476..8588a94 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -4,6 +4,7 @@ import {
   StyleSheet,
   TouchableOpacity,
   ScrollView,
+  ActivityIndicator,
   Image,
 } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
@@ -22,6 +23,7 @@ const OrderDetailScreen = () => {
   const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
     undefined,
   );
+  const [loading, setLoading] = useState(true);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -37,16 +39,23 @@ const OrderDetailScreen = () => {
         }
       } catch (error) {
         console.log(error);
-        setErrorMessage('Ocurrio un error');
+        setErrorMessage('Ocurrió un error');
+        setShowErrorAlert(true);
+      } finally {
+        setLoading(false);
       }
     };
 
     fetchOrder();
   }, []);
 
-  const handleReorder = async () => {
-    setShowSuccessAlert(true);
-  };
+  if (loading) {
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
 
   return (
     <ScrollView contentContainerStyle={styles.container}>
@@ -99,7 +108,7 @@ const OrderDetailScreen = () => {
             title="Re ordenar"
             size="small"
             style={{ paddingVertical: 0 }}
-            onPress={handleReorder}
+            onPress={() => setShowSuccessAlert(true)}
           />
         </View>
         <ScrollView style={{ height: 400 }}>
@@ -208,6 +217,12 @@ const styles = StyleSheet.create({
     right: 0,
     zIndex: 1000,
   },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
   orderHeader: {
     alignItems: 'center',
     marginTop: 30,
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index bbf7d2d..6571635 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -1,11 +1,17 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  TouchableOpacity,
+  ActivityIndicator,
+} from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
 import Button from '../components/Button';
-import { OrderResponse } from '@pharmatech/sdk'; // Usar el tipo del SDK
+import { OrderResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
 
@@ -13,6 +19,7 @@ const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
     undefined,
   );
+  const [loading, setLoading] = useState(true);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showInfoAlert, setShowInfoAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
@@ -33,12 +40,22 @@ const OrdersScreen = () => {
         console.log(error);
         setErrorMessage('Ha ocurrido un error');
         setShowErrorAlert(true);
+      } finally {
+        setLoading(false); // Finalizar carga
       }
     };
 
     fetchOrders();
   }, []);
 
+  if (loading) {
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -168,6 +185,12 @@ const styles = StyleSheet.create({
   orderInfo: {
     marginVertical: 5,
   },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
 });
 
 export default OrdersScreen;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index b4b555c..cab93c6 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -25,73 +25,25 @@ export default function HomeScreen() {
     return cartItem ? cartItem.quantity : 0;
   };
 
-  const obtainProducts = async () => {
-    const productsData = await ProductService.getProducts(1, 20);
-
-    if (productsData.success) {
-      const pd = productsData.data.results;
-      const carouselProducts = pd.map((p) => ({
-        id: p.id,
-        presentationId: p.presentation.id,
-        productId: p.product.id,
-        imageUrl: p.product.images[0].url,
-        name:
-          p.product.name +
-          ' ' +
-          p.presentation.name +
-          ' ' +
-          p.presentation.quantity +
-          ' ' +
-          p.presentation.measurementUnit,
-        category: p.product.categories[0].name,
-        originalPrice: p.price,
-        discount: 10,
-        finalPrice: p.price - p.price * 0.1,
-        quantity: getItemQuantity(p.id),
-        getQuantity: (quantity: number) => {
-          addToCart({
-            id: p.id,
-            name:
-              p.product.name +
-              ' ' +
-              p.presentation.name +
-              ' ' +
-              p.presentation.quantity +
-              ' ' +
-              p.presentation.measurementUnit,
-            price: p.price,
-            quantity,
-            image:
-              p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
-          });
-          updateCartQuantity(p.id, quantity);
-        },
-      }));
-
-      setProducts(carouselProducts);
-    } else {
-      console.log(productsData.error);
-    }
-  };
-
   useEffect(() => {
-    const checkAuthToken = async () => {
+    const initialize = async () => {
+      setLoading(true); // Asegúrate de que loading sea true al inicio
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
-        router.replace('/login'); // Redirige al login si no hay token
+        router.replace('/login');
       } else {
-        console.log('JWT Token:', token); // Log del JWT
         const decoded = decodeJWT(token);
         if (decoded?.userId) {
-          setCartUserId(decoded.userId); // Set the userId in the cart
+          setCartUserId(decoded.userId);
         }
-        setLoading(false);
       }
+
+      await obtainProducts(); // Espera a que los productos se carguen
+      setLoading(false); // Cambia loading a false solo después de que todo termine
     };
 
-    checkAuthToken();
-    obtainProducts();
-  }, [cartItems]);
+    initialize();
+  }, []); // Elimina `cartItems` de las dependencias
 
   useEffect(() => {
     if (showEmailVerificationParam) {
@@ -102,16 +54,60 @@ export default function HomeScreen() {
     }
   }, [showEmailVerificationParam]);
 
-  if (loading) {
-    return (
-      <View style={styles.loadingContainer}>
-        <ActivityIndicator size="large" color={Colors.primary} />
-        <PoppinsText weight="regular" style={styles.loadingText}>
-          Verificando autenticación...
-        </PoppinsText>
-      </View>
-    );
-  }
+  const obtainProducts = async () => {
+    setLoading(true); // Inicia el indicador de carga
+    try {
+      const productsData = await ProductService.getProducts(1, 20);
+      if (productsData.success) {
+        const pd = productsData.data.results;
+        const carouselProducts = pd.map((p) => ({
+          id: p.id,
+          presentationId: p.presentation.id,
+          productId: p.product.id,
+          imageUrl: p.product.images[0].url,
+          name:
+            p.product.name +
+            ' ' +
+            p.presentation.name +
+            ' ' +
+            p.presentation.quantity +
+            ' ' +
+            p.presentation.measurementUnit,
+          category: p.product.categories[0].name,
+          originalPrice: p.price,
+          discount: 10,
+          finalPrice: p.price - p.price * 0.1,
+          quantity: getItemQuantity(p.id),
+          getQuantity: (quantity: number) => {
+            addToCart({
+              id: p.id,
+              name:
+                p.product.name +
+                ' ' +
+                p.presentation.name +
+                ' ' +
+                p.presentation.quantity +
+                ' ' +
+                p.presentation.measurementUnit,
+              price: p.price,
+              quantity,
+              image:
+                p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
+            });
+            updateCartQuantity(p.id, quantity);
+          },
+        }));
+
+        setProducts(carouselProducts);
+      } else {
+        console.log(productsData.error);
+      }
+    } catch (error) {
+      console.error('Error fetching products:', error);
+    } finally {
+      setLoading(false); // Finaliza el indicador de carga
+    }
+  };
 
   return (
     <View testID="home-screen" style={styles.container}>
@@ -121,7 +117,16 @@ export default function HomeScreen() {
             Ofertas especiales
           </PoppinsText>
           <View style={styles.rowFullWidth}>
-            <Carousel cards={products} />
+            {loading ? (
+              <View style={styles.loadingContainer}>
+                <PoppinsText style={styles.loadingText}>
+                  Cargando ofertas...
+                </PoppinsText>
+                <ActivityIndicator size="large" color={Colors.primary} />
+              </View>
+            ) : (
+              <Carousel cards={products} />
+            )}
           </View>
         </View>
         <View>
@@ -129,7 +134,16 @@ export default function HomeScreen() {
             Medicamentos
           </PoppinsText>
           <View style={styles.rowFullWidth}>
-            <Carousel cards={products} />
+            {loading ? (
+              <View style={styles.loadingContainer}>
+                <PoppinsText style={styles.loadingText}>
+                  Cargando medicamentos...
+                </PoppinsText>
+                <ActivityIndicator size="large" color={Colors.primary} />
+              </View>
+            ) : (
+              <Carousel cards={products} />
+            )}
           </View>
         </View>
       </ScrollView>

From 87cb43a08a8827acdf1b49e6b438ac9d5bf3394d Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 26 Apr 2025 19:50:02 -0400
Subject: [PATCH 162/291] Changing where app starts for delivery users

---
 src/screens/LoginScreen.tsx  | 31 ++++++++++++++++---------------
 src/screens/MenuScreen.tsx   |  2 +-
 src/screens/SplashScreen.tsx | 25 ++++++++++++++++++++++---
 src/services/auth.ts         | 19 +++++++++++++------
 4 files changed, 52 insertions(+), 25 deletions(-)

diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index 6ab0a84..efcdc60 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -17,6 +17,7 @@ import { Colors, FontSizes } from '../styles/theme';
 import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import GoogleLogo from '../assets/images/logos/Google_Logo.png';
 import { AuthService } from '../services/auth';
+import { UserService } from '../services/user';
 import Alert from '../components/Alerts';
 
 export default function LoginScreen() {
@@ -35,25 +36,25 @@ export default function LoginScreen() {
     try {
       const result = await AuthService.login(email, password);
       if (result.success) {
-        const { isValidated } = result.data!;
+        const profileResponse = await UserService.getProfile();
+        if (profileResponse.success) {
+          const userRole = profileResponse.data.role;
 
-        // Mostrar alerta de éxito para todos los usuarios
-        setShowSuccessAlert(true);
-
-        setTimeout(() => {
-          setShowSuccessAlert(false);
-
-          if (!isValidated) {
-            // Redirigir al home con el modal de verificación de correo
-            router.replace({
-              pathname: '/(tabs)',
-              params: { showEmailVerification: 'true' },
-            });
+          if (userRole === 'delivery') {
+            // Redirigir a (delivery-tabs) si es un usuario de tipo delivery
+            router.replace('/(delivery-tabs)');
           } else {
-            // Redirigir al home si el correo ya está validado
+            // Redirigir a (tabs) si es un usuario regular
             router.replace('/(tabs)');
           }
-        }, 2000);
+        } else {
+          console.error(
+            'Error al obtener el perfil del usuario:',
+            profileResponse.error,
+          );
+          setShowErrorAlert(true);
+          setErrorMessage('Error al obtener el perfil del usuario.');
+        }
       } else {
         setShowErrorAlert(true);
         setErrorMessage(result.error || 'Error al iniciar sesión.');
diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
index ed7d1f1..a7bc1ab 100644
--- a/src/screens/MenuScreen.tsx
+++ b/src/screens/MenuScreen.tsx
@@ -66,7 +66,7 @@ export default function MenuScreen() {
   if (context === 'topBarDelivery') {
     items.push({
       id: '6',
-      title: 'Volver al flujo regular',
+      title: 'Ir al flujo regular',
       icon: <ArrowsRightLeftIcon color={Colors.iconMainPrimary} />,
       onPress: () => router.push('/(tabs)'),
     });
diff --git a/src/screens/SplashScreen.tsx b/src/screens/SplashScreen.tsx
index f177c06..6c3d1e2 100644
--- a/src/screens/SplashScreen.tsx
+++ b/src/screens/SplashScreen.tsx
@@ -2,6 +2,7 @@ import React, { useEffect } from 'react';
 import { View, StyleSheet } from 'react-native';
 import { useRouter } from 'expo-router';
 import { AuthService } from '../services/auth';
+import { UserService } from '../services/user';
 import { Colors } from '../styles/theme';
 
 export default function SplashScreen() {
@@ -12,13 +13,31 @@ export default function SplashScreen() {
       try {
         const isValidSession = await AuthService.validateSession();
         if (isValidSession) {
-          router.replace('/(tabs)');
+          // Obtener el perfil del usuario para determinar el rol
+          const profileResponse = await UserService.getProfile();
+          if (profileResponse.success) {
+            const userRole = profileResponse.data.role;
+
+            if (userRole === 'delivery') {
+              // Redirigir a (delivery-tabs) si es un usuario de tipo delivery
+              router.replace('/(delivery-tabs)');
+            } else {
+              // Redirigir a (tabs) si es un usuario regular
+              router.replace('/(tabs)');
+            }
+          } else {
+            console.error(
+              'Error al obtener el perfil del usuario:',
+              profileResponse.error,
+            );
+            router.replace('/login'); // Redirigir al login en caso de error
+          }
         } else {
-          router.replace('/login');
+          router.replace('/login'); // Redirigir al login si la sesión no es válida
         }
       } catch (error) {
         console.error('Error al validar la sesión:', error);
-        router.replace('/login'); // Redirige al login en caso de error
+        router.replace('/login'); // Redirigir al login en caso de error
       }
     };
 
diff --git a/src/services/auth.ts b/src/services/auth.ts
index 844d565..074e1d6 100644
--- a/src/services/auth.ts
+++ b/src/services/auth.ts
@@ -296,19 +296,26 @@ export const AuthService = {
     }
   },
 
-  validateSession: async (): Promise<boolean> => {
+  validateSession: async (): Promise<{
+    isValid: boolean;
+    userRole?: string;
+  }> => {
     try {
       const token = await SecureStore.getItemAsync('auth_token');
-      if (!token) return false;
+      if (!token) return { isValid: false };
 
       const decoded = decodeJWT(token);
-      if (!decoded || !decoded.userId) return false;
+      if (!decoded || !decoded.userId) return { isValid: false };
 
-      console.log('Token válido. Usuario ID:', decoded.userId);
-      return true; // El token es válido
+      const profileResponse = await UserService.getProfile();
+      if (profileResponse.success) {
+        return { isValid: true, userRole: profileResponse.data.role };
+      }
+
+      return { isValid: false };
     } catch (error) {
       console.error('Error al validar la sesión:', error);
-      return false;
+      return { isValid: false };
     }
   },
 };

From a5e1c3dd5393637c254bd116c2c592061066f28e Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 27 Apr 2025 14:04:31 -0400
Subject: [PATCH 163/291] Delivery fixes and fixing alerts I erased in login by
 mistake

---
 src/components/OrderCard.tsx                  |  32 +++--
 src/screens/LoginScreen.tsx                   |  34 +++--
 src/screens/delivery/DeliveryDetailScreen.tsx | 133 +++++++++++-------
 .../delivery/DeliveryHistoryScreen.tsx        |   2 +-
 src/screens/delivery/DeliveryHomeScreen.tsx   |  29 +++-
 5 files changed, 154 insertions(+), 76 deletions(-)

diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
index 5960184..ca4451b 100644
--- a/src/components/OrderCard.tsx
+++ b/src/components/OrderCard.tsx
@@ -17,8 +17,13 @@ interface OrderCardProps {
   branch: string;
   estimatedTime: string;
   elapsedTime: string;
+  deliveryStatus:
+    | 'assigned'
+    | 'waiting_confirmation'
+    | 'picked_up'
+    | 'in_route'; // Nueva prop
   onTakeOrder: () => void;
-  onDiscardOrder: () => void;
+  onDiscardOrder?: () => void;
 }
 
 const OrderCard: React.FC<OrderCardProps> = ({
@@ -28,6 +33,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
   branch,
   estimatedTime,
   elapsedTime,
+  deliveryStatus,
   onTakeOrder,
   onDiscardOrder,
 }) => {
@@ -75,20 +81,24 @@ const OrderCard: React.FC<OrderCardProps> = ({
       {/* Buttons */}
       <View>
         <Button
-          title="Tomar pedido"
+          title={
+            deliveryStatus === 'assigned' ? 'Tomar pedido' : 'Continuar entrega'
+          }
           variant="primary"
           size="medium"
           onPress={onTakeOrder}
           style={styles.button}
         />
-        <Button
-          title="Descartar"
-          variant="iconCancel"
-          mode="outline"
-          size="medium"
-          onPress={onDiscardOrder}
-          style={styles.button}
-        />
+        {deliveryStatus === 'assigned' && onDiscardOrder && (
+          <Button
+            title="Descartar"
+            variant="iconCancel"
+            mode="outline"
+            size="medium"
+            onPress={onDiscardOrder}
+            style={styles.button}
+          />
+        )}
       </View>
     </View>
   );
@@ -106,7 +116,7 @@ const styles = StyleSheet.create({
     shadowRadius: 4,
     elevation: 2,
     width: '100%',
-    minHeight: 300,
+    minHeight: 250,
     flexGrow: 1,
   },
   header: {
diff --git a/src/screens/LoginScreen.tsx b/src/screens/LoginScreen.tsx
index efcdc60..716c083 100644
--- a/src/screens/LoginScreen.tsx
+++ b/src/screens/LoginScreen.tsx
@@ -38,15 +38,29 @@ export default function LoginScreen() {
       if (result.success) {
         const profileResponse = await UserService.getProfile();
         if (profileResponse.success) {
-          const userRole = profileResponse.data.role;
+          const { role: userRole } = profileResponse.data;
+          const { isValidated } = result.data!;
 
-          if (userRole === 'delivery') {
-            // Redirigir a (delivery-tabs) si es un usuario de tipo delivery
-            router.replace('/(delivery-tabs)');
-          } else {
-            // Redirigir a (tabs) si es un usuario regular
-            router.replace('/(tabs)');
-          }
+          // Mostrar alerta de éxito para todos los usuarios
+          setShowSuccessAlert(true);
+
+          setTimeout(() => {
+            setShowSuccessAlert(false);
+
+            if (!isValidated) {
+              // Redirigir al home con el modal de verificación de correo
+              router.replace({
+                pathname: '/(tabs)',
+                params: { showEmailVerification: 'true' },
+              });
+            } else if (userRole === 'delivery') {
+              // Redirigir a (delivery-tabs) si es un usuario de tipo delivery
+              router.replace('/(delivery-tabs)');
+            } else {
+              // Redirigir a (tabs) si es un usuario regular
+              router.replace('/(tabs)');
+            }
+          }, 2000);
         } else {
           console.error(
             'Error al obtener el perfil del usuario:',
@@ -60,9 +74,9 @@ export default function LoginScreen() {
         setErrorMessage(result.error || 'Error al iniciar sesión.');
       }
     } catch (error) {
-      console.error(error);
+      console.error('Error during login:', error);
       setShowErrorAlert(true);
-      setErrorMessage('Error al iniciar sesión, verifica tus credenciales.');
+      setErrorMessage('Error inesperado al iniciar sesión.');
     } finally {
       setLoading(false);
     }
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index 95af480..f8d8b61 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -23,6 +23,7 @@ import {
   setOrderDetails,
   setDeliveryState,
 } from '../../redux/slices/deliverySlice';
+import Popup from '../../components/Popup';
 
 const DeliveryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
@@ -59,9 +60,10 @@ const DeliveryDetailScreen: React.FC = () => {
     'Ya tengo los productos del pedido',
     'Ir a destino de entrega',
     'Ya hice la entrega',
-    'Finalizar entrega',
   ];
 
+  const [showConfirmationPopup, setShowConfirmationPopup] = useState(false);
+
   const branchLocation = {
     latitude: branchNames[orderDetails?.branchId ?? '']?.latitude || 0,
     longitude: branchNames[orderDetails?.branchId ?? '']?.longitude || 0,
@@ -113,55 +115,46 @@ const DeliveryDetailScreen: React.FC = () => {
 
   const handleNextState = async () => {
     try {
-      if (deliveryState === 5) {
-        router.dismiss(2);
-        router.replace('/(delivery-tabs)');
+      if (deliveryState === buttonStates.length - 1) {
+        // Mostrar el popup de confirmación
+        setShowConfirmationPopup(true);
         return;
       }
 
-      if (deliveryState < buttonStates.length - 1) {
-        // Actualizar el estado en el backend
-        switch (buttonStates[deliveryState]) {
-          case 'Comenzar entrega':
-            await DeliveryService.updateOrderStatus(
-              orderDetails!.id,
-              OrderDeliveryStatus.WAITING_CONFIRMATION,
-            );
-            break;
-          case 'Ya tengo los productos del pedido':
-            await DeliveryService.updateOrderStatus(
-              orderDetails!.id,
-              OrderDeliveryStatus.PICKED_UP,
-            );
-            break;
-          case 'Ir a destino de entrega':
-            await DeliveryService.updateOrderStatus(
-              orderDetails!.id,
-              OrderDeliveryStatus.IN_ROUTE,
-            );
-            setDeliveryStateBadge(1); // Cambiar a "Haciendo entrega del pedido"
-            break;
-          case 'Ya hice la entrega':
-            await DeliveryService.updateOrderStatus(
-              orderDetails!.id,
-              OrderDeliveryStatus.DELIVERED,
-            );
-            break;
-        }
-
-        setAlertType('info');
-        setAlertMessage('Se actualizó el estado del pedido.');
-        setShowAlert(true);
-
-        // Agregar timeout para ocultar la alerta automáticamente
-        setTimeout(() => {
-          setShowAlert(false);
-        }, 3000); // 3 segundos
-
-        dispatch(
-          setDeliveryState({ id: id as string, state: deliveryState + 1 }),
-        );
+      // Lógica para otros estados
+      switch (buttonStates[deliveryState]) {
+        case 'Comenzar entrega':
+          await DeliveryService.updateOrderStatus(
+            orderDetails!.id,
+            OrderDeliveryStatus.WAITING_CONFIRMATION,
+          );
+          break;
+        case 'Ya tengo los productos del pedido':
+          await DeliveryService.updateOrderStatus(
+            orderDetails!.id,
+            OrderDeliveryStatus.PICKED_UP,
+          );
+          break;
+        case 'Ir a destino de entrega':
+          await DeliveryService.updateOrderStatus(
+            orderDetails!.id,
+            OrderDeliveryStatus.IN_ROUTE,
+          );
+          setDeliveryStateBadge(1); // Cambiar a "Haciendo entrega del pedido"
+          break;
       }
+
+      setAlertType('info');
+      setAlertMessage('Se actualizó el estado del pedido.');
+      setShowAlert(true);
+
+      setTimeout(() => {
+        setShowAlert(false);
+      }, 2500);
+
+      dispatch(
+        setDeliveryState({ id: id as string, state: deliveryState + 1 }),
+      );
     } catch (error) {
       console.error('Error al actualizar el estado del delivery:', error);
 
@@ -169,13 +162,45 @@ const DeliveryDetailScreen: React.FC = () => {
       setAlertMessage('Hubo un problema al actualizar el estado del pedido.');
       setShowAlert(true);
 
-      // Agregar timeout para ocultar la alerta automáticamente
       setTimeout(() => {
         setShowAlert(false);
       }, 2000);
     }
   };
 
+  const handleConfirmDelivery = async () => {
+    try {
+      // Actualizar el estado de la orden a DELIVERED
+      await DeliveryService.updateOrderStatus(
+        orderDetails!.id,
+        OrderDeliveryStatus.DELIVERED,
+      );
+
+      setAlertType('success');
+      setAlertMessage('La entrega se ha finalizado correctamente.');
+      setShowAlert(true);
+
+      setTimeout(() => {
+        setShowAlert(false);
+      }, 2500);
+
+      // Redirigir al usuario a (delivery-tabs)
+      router.replace('/(delivery-tabs)');
+    } catch (error) {
+      console.error('Error al finalizar la entrega:', error);
+
+      setAlertType('error');
+      setAlertMessage('Hubo un problema al finalizar la entrega.');
+      setShowAlert(true);
+
+      setTimeout(() => {
+        setShowAlert(false);
+      }, 2000);
+    } finally {
+      setShowConfirmationPopup(false); // Cerrar el popup
+    }
+  };
+
   if (loading) {
     return <ActivityIndicator size="large" color={Colors.primary} />;
   }
@@ -352,6 +377,20 @@ const DeliveryDetailScreen: React.FC = () => {
         onPress={handleNextState}
         style={styles.floatingButton}
       />
+      <Popup
+        visible={showConfirmationPopup}
+        headerText="Confirmar entrega"
+        bodyText="¿Estás seguro de que has realizado la entrega del pedido?"
+        primaryButton={{
+          text: 'Confirmar',
+          onPress: handleConfirmDelivery,
+        }}
+        secondaryButton={{
+          text: 'Cancelar',
+          onPress: () => setShowConfirmationPopup(false),
+        }}
+        onClose={() => setShowConfirmationPopup(false)}
+      />
     </View>
   );
 };
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 6dab5ab..482b988 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -115,7 +115,7 @@ const DeliveryHistoryScreen: React.FC = () => {
           completedOrders.map((order) => (
             <HistoryOrderCard
               key={order.id}
-              orderCode={order.id.split('-')[0]} // Mostrar solo los primeros 8 caracteres
+              orderCode={order.orderId.split('-')[0]} // Mostrar solo los primeros 8 caracteres
               orderType="pedido"
               address={order.address?.adress || 'Dirección no disponible'}
               branch={branchNames[order.branchId] || 'Sucursal no disponible'}
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index da0c0e5..3f63b72 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+import { useFocusEffect } from '@react-navigation/native'; // Importar useFocusEffect
+import React, { useCallback, useState } from 'react';
 import {
   View,
   StyleSheet,
@@ -23,7 +24,7 @@ import { useAlert } from '../../components/AlertProvider'; // Importar el hook u
 
 export default function DeliveryHomeScreen() {
   const router = useRouter();
-  const { showAlert } = useAlert(); // Usar el hook para acceder a la función showAlert
+  const { showAlert } = useAlert();
 
   const [orders, setOrders] = useState<OrderDeliveryDetailedResponse[]>([]);
   const [branchNames, setBranchNames] = useState<Record<string, string>>({});
@@ -81,9 +82,12 @@ export default function DeliveryHomeScreen() {
     }
   };
 
-  useEffect(() => {
-    fetchAssignedOrders();
-  }, []);
+  // Usar useFocusEffect para refrescar la pantalla al regresar
+  useFocusEffect(
+    useCallback(() => {
+      fetchAssignedOrders(); // Refrescar las órdenes asignadas
+    }, []),
+  );
 
   const handleTakeOrder = (order: OrderDeliveryDetailedResponse) => {
     const query = encodeURIComponent(JSON.stringify(order));
@@ -179,14 +183,25 @@ export default function DeliveryHomeScreen() {
           orders.map((order) => (
             <OrderCard
               key={order.id}
-              orderCode={order.id.split('-')[0]} // Mostrar solo los primeros 8 caracteres
+              orderCode={order.orderId.split('-')[0]} // Mostrar solo los primeros 8 caracteres
               orderType="pedido"
               address={order.address?.adress || 'Dirección no disponible'}
               branch={branchNames[order.branchId] || 'Sucursal no disponible'}
               estimatedTime={formatTime(order.estimatedTime)} // Pasar directamente la cadena ISO
               elapsedTime={calculateElapsedTime(order.createdAt)}
+              deliveryStatus={
+                order.deliveryStatus as
+                  | 'assigned'
+                  | 'waiting_confirmation'
+                  | 'picked_up'
+                  | 'in_route'
+              }
               onTakeOrder={() => handleTakeOrder(order)}
-              onDiscardOrder={() => handleDiscardOrder(order)}
+              onDiscardOrder={
+                order.deliveryStatus === 'assigned'
+                  ? () => handleDiscardOrder(order)
+                  : undefined
+              }
             />
           ))
         )}

From 36d347ae9ca793dab027010b8ba684034be4ce3e Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 27 Apr 2025 21:38:58 -0400
Subject: [PATCH 164/291] Enhanced alerts

---
 src/screens/ProfileScreen.tsx | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index da07fc8..3af8d27 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -14,7 +14,6 @@ import Button from '../components/Button';
 import { UserService } from '../services/user';
 import { UpdateUser, UserList } from '@pharmatech/sdk';
 import { PencilIcon, TrashIcon } from 'react-native-heroicons/outline';
-import { useRouter } from 'expo-router';
 import DatePickerInput from '../components/DatePickerInput';
 import * as ImagePicker from 'expo-image-picker';
 import {
@@ -41,7 +40,6 @@ const ProfileScreen = () => {
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
   const [loading, setLoading] = useState(false);
-  const router = useRouter();
 
   useEffect(() => {
     const fetchProfile = async () => {
@@ -107,9 +105,10 @@ const ProfileScreen = () => {
 
       if (response.success) {
         setIsEditable(false);
-        alert('Perfil actualizado exitosamente');
+        setShowSuccessAlert(true);
       } else {
-        alert('Error al actualizar el perfil');
+        setShowErrorAlert(true);
+        setErrorMessage('Error al actualizar el perfil');
       }
       setLoading(false);
     } catch (error) {
@@ -149,10 +148,9 @@ const ProfileScreen = () => {
           <Alert
             type="success"
             title="Éxito"
-            message="Cuenta creada correctamente"
+            message="Perfil actualizado exitosamente"
             onClose={() => {
               setShowSuccessAlert(false);
-              router.replace('/success');
             }}
             borderColor
           />
@@ -315,9 +313,9 @@ const styles = StyleSheet.create({
   alertContainer: {
     position: 'absolute',
     width: 326,
-    left: '50%',
+    left: '56%',
     marginLeft: -162,
-    top: 20,
+    top: 60,
     right: 0,
     zIndex: 1000,
   },

From bac7c38d4d4000515edbd115f1ff66e8dbb69ad7 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 27 Apr 2025 21:57:22 -0400
Subject: [PATCH 165/291] Updated stock to Disponible in productdetal

---
 src/components/BranchMap.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/components/BranchMap.tsx b/src/components/BranchMap.tsx
index a4a80e2..e6556e7 100644
--- a/src/components/BranchMap.tsx
+++ b/src/components/BranchMap.tsx
@@ -27,7 +27,7 @@ const CustomMarker = React.memo(({ branch }: { branch: Branch }) => (
       longitude: branch.longitude!,
     }}
     title={branch.name}
-    description={`Stock: ${branch.stockQuantity ?? 'No disponible'}`}
+    description={`Disponible: ${branch.stockQuantity ?? 'No disponible'}`}
   >
     <View style={styles.customMarker}>
       <MapPinIcon size={32} color={Colors.primary} />

From 062db9616d389228bca4e032a68eb18b34a5665b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 27 Apr 2025 22:59:38 -0400
Subject: [PATCH 166/291] Added show map button and updated dropdown

---
 src/screens/ProductDetailScreen.tsx | 64 +++++++++++++++++------------
 1 file changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 391d8ce..14569e5 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -37,6 +37,7 @@ import {
   ProductPresentationDetailResponse,
   ProductPresentationResponse,
 } from '@pharmatech/sdk';
+import Button from '../components/Button';
 
 const ProductDetailScreen: React.FC = () => {
   const { id, productId } = useLocalSearchParams<{
@@ -45,6 +46,7 @@ const ProductDetailScreen: React.FC = () => {
   }>();
   const navigation = useNavigation(); // Obtén la instancia de navegación
 
+  const [showMap, setShowMap] = useState(false);
   const [inventory, setInventory] = useState<Inventory[]>([]);
   const [states, setStates] = useState<State[]>([]);
   const [product, setProduct] = useState<ProductPresentationDetailResponse>();
@@ -151,8 +153,12 @@ const ProductDetailScreen: React.FC = () => {
 
       if (productData.success) setProduct(productData.data);
       if (productImages.success) setImages(productImages.data);
-      if (productPresentations.success)
-        setPresentations(productPresentations.data);
+      if (productPresentations.success) {
+        const presentations = productPresentations.data.filter(
+          (item) => item.presentation.id !== id,
+        );
+        setPresentations(presentations);
+      }
       if (states.success) setStates(states.data.results);
     };
 
@@ -375,30 +381,36 @@ const ProductDetailScreen: React.FC = () => {
               Disponibilidad en sucursales
             </PoppinsText>
             <View style={styles.quantitySelector}>
-              <View style={{ flex: 1, height: 300 }}>
-                {inventory && inventory.length > 0 ? (
-                  <BranchMap
-                    branches={inventory.map((inv) => ({
-                      id: inv.branch.id,
-                      name: inv.branch.name,
-                      address: inv.branch.address,
-                      latitude: inv.branch.latitude,
-                      longitude: inv.branch.longitude,
-                      stockQuantity: inv.stockQuantity,
-                    }))}
-                  />
-                ) : (
-                  <PoppinsText
-                    style={{
-                      textAlign: 'center',
-                      color: Colors.textLowContrast,
-                      marginVertical: 10,
-                    }}
-                  >
-                    No hay productos disponibles
-                  </PoppinsText>
-                )}
-              </View>
+              {showMap ? (
+                <View style={{ flex: 1, height: 300 }}>
+                  {inventory && inventory.length > 0 ? (
+                    <BranchMap
+                      branches={inventory.map((inv) => ({
+                        id: inv.branch.id,
+                        name: inv.branch.name,
+                        address: inv.branch.address,
+                        latitude: inv.branch.latitude,
+                        longitude: inv.branch.longitude,
+                        stockQuantity: inv.stockQuantity,
+                      }))}
+                    />
+                  ) : (
+                    <PoppinsText
+                      style={{
+                        textAlign: 'center',
+                        color: Colors.textLowContrast,
+                        marginVertical: 10,
+                      }}
+                    >
+                      No hay productos disponibles
+                    </PoppinsText>
+                  )}
+                </View>
+              ) : (
+                <View style={{ flex: 1 }}>
+                  <Button title="Ver Mapa" onPress={() => setShowMap(true)} />
+                </View>
+              )}
             </View>
             <PoppinsText style={styles.sectionTitle}>
               Selecciona el estado

From 7b2bbd22d142f9e7cb582920de433815fa508c96 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 27 Apr 2025 23:07:52 -0400
Subject: [PATCH 167/291] Static product name in dropdown

---
 src/screens/ProductDetailScreen.tsx | 46 ++++++++++++++++++-----------
 1 file changed, 29 insertions(+), 17 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 14569e5..b817204 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -354,23 +354,35 @@ const ProductDetailScreen: React.FC = () => {
               Selecciona la presentación
             </PoppinsText>
             <View style={styles.quantitySelector}>
-              <Dropdown
-                placeholder="Presentación..."
-                options={
-                  presentations?.map(
-                    (p: ProductPresentationResponse) =>
-                      product?.product.name +
-                      ' ' +
-                      p.presentation.name +
-                      ' ' +
-                      p.presentation.quantity +
-                      ' ' +
-                      p.presentation.measurementUnit,
-                  ) || []
-                }
-                borderColor={Colors.gray_100}
-                onSelect={(e) => changePresentation(e)}
-              />
+              {product ? (
+                <Dropdown
+                  placeholder={
+                    product?.product.name +
+                    ' ' +
+                    product?.presentation.name +
+                    ' ' +
+                    product?.presentation.quantity +
+                    ' ' +
+                    product?.presentation.measurementUnit
+                  }
+                  options={
+                    presentations?.map(
+                      (p: ProductPresentationResponse) =>
+                        product?.product.name +
+                        ' ' +
+                        p.presentation.name +
+                        ' ' +
+                        p.presentation.quantity +
+                        ' ' +
+                        p.presentation.measurementUnit,
+                    ) || []
+                  }
+                  borderColor={Colors.gray_100}
+                  onSelect={(e) => changePresentation(e)}
+                />
+              ) : (
+                <ActivityIndicator size="small" color={Colors.primary} />
+              )}
             </View>
             <PoppinsText
               style={[

From 7611cd36fe3e8fc30d797d4b398360e8947f178f Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 27 Apr 2025 23:54:59 -0400
Subject: [PATCH 168/291] Added OrderBadge component for order status

---
 src/components/OrderBadge.tsx | 59 +++++++++++++++++++++++++++++++++++
 src/screens/OrdersScreen.tsx  | 17 ++--------
 2 files changed, 62 insertions(+), 14 deletions(-)
 create mode 100644 src/components/OrderBadge.tsx

diff --git a/src/components/OrderBadge.tsx b/src/components/OrderBadge.tsx
new file mode 100644
index 0000000..553eb94
--- /dev/null
+++ b/src/components/OrderBadge.tsx
@@ -0,0 +1,59 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+
+// Define los tipos para las props del componente
+type BadgeProps = {
+  status: string;
+};
+
+// Mapeo de estados en inglés a colores y etiquetas en español
+const STATUS_COLORS: Record<string, string> = {
+  requested: Colors.semanticDanger,
+  ready_for_pickup: Colors.semanticInfo,
+  completed: Colors.semanticSuccess,
+  canceled: Colors.semanticDanger,
+  in_progress: Colors.secondaryGray,
+  approved: Colors.secondary,
+};
+
+const STATUS_LABELS: Record<string, string> = {
+  requested: 'Pendiente',
+  ready_for_pickup: 'A Enviar',
+  completed: 'Entregado',
+  canceled: 'Cancelado',
+  in_progress: 'En Proceso',
+  approved: 'Aprobado',
+};
+
+const OrderBadge: React.FC<BadgeProps> = ({ status }) => {
+  // Normalizamos el estado a minúsculas para evitar problemas de case sensitivity
+  const normalizedStatus = status.toLowerCase();
+
+  // Obtener el color y texto correspondiente al estado
+  const backgroundColor =
+    STATUS_COLORS[normalizedStatus] || STATUS_COLORS.default;
+  const label = STATUS_LABELS[normalizedStatus] || STATUS_LABELS.default;
+
+  return (
+    <View style={[styles.badge, { backgroundColor }]}>
+      <PoppinsText style={styles.badgeText}>{label}</PoppinsText>
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  badge: {
+    padding: 5,
+    borderRadius: 5,
+    width: 80,
+  },
+  badgeText: {
+    color: Colors.textWhite,
+    fontSize: FontSizes.c1.size,
+    textAlign: 'center',
+  },
+});
+
+export default OrderBadge;
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index bbf7d2d..af5fedf 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -8,6 +8,7 @@ import Button from '../components/Button';
 import { OrderResponse } from '@pharmatech/sdk'; // Usar el tipo del SDK
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
+import OrderBadge from '../components/OrderBadge';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -94,7 +95,7 @@ const OrdersScreen = () => {
                 >
                   <View>
                     <PoppinsText>
-                      {order ? truncateString(order?.id, 8) : ''}
+                      #{order ? truncateString(order?.id, 8) : ''}
                     </PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
                       {new Date(order.createdAt).toLocaleDateString()}{' '}
@@ -111,19 +112,7 @@ const OrdersScreen = () => {
                     marginTop: 5,
                   }}
                 >
-                  <PoppinsText
-                    style={{
-                      padding: 5,
-                      backgroundColor: Colors.semanticDanger,
-                      borderRadius: 5,
-                      width: 80,
-                      textAlign: 'center',
-                      color: Colors.textWhite,
-                      fontSize: FontSizes.c1.size,
-                    }}
-                  >
-                    {order.status}
-                  </PoppinsText>
+                  <OrderBadge status={order.status} />
                   <TouchableOpacity
                     onPress={() => router.push(`order/${order.id}`)}
                   >

From 0d3dfe4554b7a48fa714169dda3207f50fb19b08 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 29 Apr 2025 00:46:59 -0400
Subject: [PATCH 169/291] see build message

---
 src/screens/ProfileScreen.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 3af8d27..6232761 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -97,8 +97,11 @@ const ProfileScreen = () => {
 
       if (image !== null) {
         const imageResponse = await ImageService.uploadImage(image);
-        if (imageResponse)
+        if (imageResponse) {
           updatedProfile.profilePicture = imageResponse.secure_url;
+          setErrorMessage(imageResponse.json());
+          setShowErrorAlert(true);
+        }
       }
 
       const response = await UserService.updateProfile(updatedProfile);

From c926eb1f6d9bf42d2b7351572f064e6b7ec3d9b2 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 29 Apr 2025 00:51:57 -0400
Subject: [PATCH 170/291] Updated profile picture

---
 src/screens/ProfileScreen.tsx | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 6232761..4ad4586 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -92,16 +92,12 @@ const ProfileScreen = () => {
         lastName: profile.lastName,
         birthDate: profile.profile?.birthDate.toString(),
         phoneNumber: profile.phoneNumber,
-        profilePicture: undefined,
       };
 
       if (image !== null) {
         const imageResponse = await ImageService.uploadImage(image);
-        if (imageResponse) {
+        if (imageResponse)
           updatedProfile.profilePicture = imageResponse.secure_url;
-          setErrorMessage(imageResponse.json());
-          setShowErrorAlert(true);
-        }
       }
 
       const response = await UserService.updateProfile(updatedProfile);

From e823c982eb86bf2aea0e1fd68520eb1e760d889e Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 29 Apr 2025 00:58:27 -0400
Subject: [PATCH 171/291] change


From 87628be98aa0c03d16d645b32b0613ebe192e914 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 29 Apr 2025 01:22:04 -0400
Subject: [PATCH 172/291] update avatar in screens

---
 src/components/Avatar.tsx | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index 2efaad7..ea715e9 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -4,6 +4,7 @@ import { Colors } from '../styles/theme';
 import { UserService } from '../services/user';
 import PoppinsText from './PoppinsText';
 import * as SecureStore from 'expo-secure-store';
+import { usePathname } from 'expo-router';
 
 type AvatarProps = {
   scale?: number; // Propiedad para definir el tamaño del avatar
@@ -12,6 +13,7 @@ type AvatarProps = {
 const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
   const [profile, setProfile] = useState<{ uri?: string; name?: string }>({});
   const [loading, setLoading] = useState(true);
+  const pathname = usePathname();
 
   useEffect(() => {
     const fetchProfile = async () => {
@@ -52,7 +54,7 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
     };
 
     fetchProfile();
-  }, []);
+  }, [pathname]);
 
   const getInitials = (fullName: string): string => {
     const words = fullName.trim().split(' ');

From 0cdd4b809f8e1c6368e9054ca15040580192d7e2 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 29 Apr 2025 02:22:21 -0400
Subject: [PATCH 173/291] Updated stock in productDetail by state

---
 src/screens/ProductDetailScreen.tsx | 83 ++++++++++++++++++-----------
 1 file changed, 51 insertions(+), 32 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index b817204..a8a5ba7 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -38,6 +38,7 @@ import {
   ProductPresentationResponse,
 } from '@pharmatech/sdk';
 import Button from '../components/Button';
+import { BranchService } from '../services/branches';
 
 const ProductDetailScreen: React.FC = () => {
   const { id, productId } = useLocalSearchParams<{
@@ -49,6 +50,7 @@ const ProductDetailScreen: React.FC = () => {
   const [showMap, setShowMap] = useState(false);
   const [inventory, setInventory] = useState<Inventory[]>([]);
   const [states, setStates] = useState<State[]>([]);
+  const [selectedState, setSelectedState] = useState('');
   const [product, setProduct] = useState<ProductPresentationDetailResponse>();
   const [images, setImages] = useState<ProductImage[]>();
   const [presentations, setPresentations] =
@@ -116,6 +118,14 @@ const ProductDetailScreen: React.FC = () => {
     }
   };
 
+  const changeState = async (name: string) => {
+    if (!states) return;
+    const state = states.find((p) => p.name === name);
+    if (state) {
+      setSelectedState(state.id);
+    }
+  };
+
   const changePresentation = async (description: string) => {
     if (!presentations) return;
     const presentation = presentations.find(
@@ -167,43 +177,52 @@ const ProductDetailScreen: React.FC = () => {
 
   useEffect(() => {
     const fetchInventory = async () => {
-      if (presentations) {
-        for (const p of presentations) {
-          const inventoryData = await InventoryService.getPresentationInventory(
-            1,
-            20,
-            p.id || '',
+      if (!selectedState) return;
+      if (product) {
+        const inventoryData = await InventoryService.getPresentationInventory(
+          1,
+          20,
+          product.id || '',
+        );
+        if (inventoryData.success) {
+          const newInventory = inventoryData.data.results.map((inv) => ({
+            id: inv.id,
+            branch: {
+              id: inv.branch.id,
+              name: inv.branch.name,
+              address: inv.branch.address,
+              latitude: inv.branch.latitude,
+              longitude: inv.branch.longitude,
+            },
+            stockQuantity: inv.stockQuantity,
+          }));
+
+          const stateBranches = await BranchService.findAll({
+            page: 1,
+            limit: 20,
+            stateId: selectedState,
+          });
+
+          const commonBranches = newInventory.filter((inv) =>
+            stateBranches.results.find((branch) => branch.id === inv.branch.id),
           );
-          if (inventoryData.success) {
-            const newInventory = inventoryData.data.results.map((inv) => ({
-              id: inv.id,
-              branch: {
-                id: inv.branch.id,
-                name: inv.branch.name,
-                address: inv.branch.address,
-                latitude: inv.branch.latitude,
-                longitude: inv.branch.longitude,
-              },
-              stockQuantity: inv.stockQuantity, // Mover al nivel superior
-            }));
-
-            setInventory((prevInventory) => {
-              const updatedInventory = [...prevInventory];
-              newInventory.forEach((newItem) => {
-                if (!prevInventory.some((item) => item.id === newItem.id)) {
-                  updatedInventory.push(newItem as Inventory);
-                }
-              });
-              return updatedInventory;
+
+          setInventory((prevInventory) => {
+            const updatedInventory: Inventory[] = [];
+            commonBranches.forEach((newItem) => {
+              if (!prevInventory.some((item) => item.id === newItem.id)) {
+                updatedInventory.push(newItem as Inventory);
+              }
             });
-          } else {
-            console.error(inventoryData.error);
-          }
+            return updatedInventory;
+          });
+        } else {
+          console.error(inventoryData.error);
         }
       }
     };
     fetchInventory();
-  }, [product]);
+  }, [selectedState]);
 
   const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
     const contentOffsetX = event.nativeEvent.contentOffset.x;
@@ -432,7 +451,7 @@ const ProductDetailScreen: React.FC = () => {
                 placeholder="Estado..."
                 options={states.map((state) => state.name)}
                 borderColor={Colors.gray_100}
-                onSelect={() => console.log('p')}
+                onSelect={(e) => changeState(e)}
               />
             </View>
             <View style={styles.availableContainer}>

From cd04ff59f5381503b7d5f5dc3aa8f16a56b4531b Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 29 Apr 2025 18:26:57 -0400
Subject: [PATCH 174/291] Add user validation check and email verification
 modal in CheckoutScreen

---
 src/screens/CheckoutScreen.tsx | 48 +++++++++++++++++++++++++++-------
 1 file changed, 39 insertions(+), 9 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 64cdf14..f2d037e 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -34,6 +34,7 @@ import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
 import { useFocusEffect } from '@react-navigation/native';
 import Popup from '../components/Popup'; // Import the Popup component
+import EmailVerificationModal from './tab/EmailVerificationModal';
 import { RootState, AppDispatch } from '../redux/store';
 import {
   setStep,
@@ -72,13 +73,19 @@ const CheckoutScreen = () => {
   const [orderNumber, setOrderNumber] = useState<string | null>(null);
   const [popupVisible, setPopupVisible] = useState(false);
   const [popupMessages, setPopupMessages] = useState<string[]>([]);
+  const [validationPopupVisible, setValidationPopupVisible] = useState(false);
+  const [emailVerificationModalVisible, setEmailVerificationModalVisible] =
+    useState(false); // Track modal visibility
 
   useEffect(() => {
     const fetchUserName = async () => {
       const response = await UserService.getProfile();
       if (response.success && response.data) {
-        const { firstName } = response.data; // Solo obtenemos el primer nombre
+        const { firstName, isValidated } = response.data;
         setUserName(firstName);
+        if (!isValidated) {
+          setValidationPopupVisible(true);
+        }
       } else if (!response.success) {
         console.error(
           'Error al obtener el nombre del usuario:',
@@ -360,17 +367,27 @@ const CheckoutScreen = () => {
   return (
     <>
       <Popup
-        visible={popupVisible}
+        visible={validationPopupVisible}
         type="center"
-        headerText="Datos Incompletos"
-        bodyText={popupMessages
-          .map((msg, index) => `${index + 1}. ${msg}`)
-          .join('\n')}
+        headerText="Validación Requerida"
+        bodyText="Debe validar su usuario para continuar con el proceso de compra."
         primaryButton={{
-          text: 'Aceptar',
-          onPress: () => setPopupVisible(false),
+          text: 'Validar Usuario',
+          onPress: () => {
+            setValidationPopupVisible(false);
+            setEmailVerificationModalVisible(true);
+          },
+        }}
+        onClose={() => {
+          setValidationPopupVisible(false);
+          router.replace({
+            pathname: '/(tabs)',
+          });
         }}
-        onClose={() => setPopupVisible(false)}
+      />
+      <EmailVerificationModal
+        visible={emailVerificationModalVisible}
+        onClose={() => setEmailVerificationModalVisible(false)} // Close the modal
       />
       <ScrollView contentContainerStyle={styles.scrollContainer}>
         <View style={styles.container}>
@@ -553,6 +570,19 @@ const CheckoutScreen = () => {
           />
         </View>
       </ScrollView>
+      <Popup
+        visible={popupVisible}
+        type="center"
+        headerText="Datos Incompletos"
+        bodyText={popupMessages
+          .map((msg, index) => `${index + 1}. ${msg}`)
+          .join('\n')}
+        primaryButton={{
+          text: 'Aceptar',
+          onPress: () => setPopupVisible(false), // Close popup
+        }}
+        onClose={() => setPopupVisible(false)}
+      />
     </>
   );
 };

From 2c43fdfe8eaed6404cda8edddadbfd3cbf6d4cb6 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 29 Apr 2025 19:36:26 -0400
Subject: [PATCH 175/291] Update @pharmatech/sdk to version 0.4.11, enhance
 PaymentInfoForm with memoized handlers and props, and improve validation
 logic in CheckoutScreen.

---
 package-lock.json                  |  9 ++-
 package.json                       |  2 +-
 src/components/PaymentInfoForm.tsx | 95 +++++++++++++++++++-----------
 src/components/PaymentMethods.tsx  | 17 +++++-
 src/screens/CheckoutScreen.tsx     |  2 +-
 5 files changed, 82 insertions(+), 43 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10c5769..9d1bada 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.9",
+        "@pharmatech/sdk": "^0.4.11",
         "@reduxjs/toolkit": "^2.6.1",
         "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
@@ -4023,10 +4023,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.9.tgz",
-      "integrity": "sha512-E0UKWSs1R8CEXCxHSqmVFvlNcYg8xcPJrTQVDAUnrMeAIBBVBck4gg9ymXYIAVlbMzhpxoSVBQB5zWreFzNoUw==",
-      "license": "MIT",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
+      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 8e5ab7d..e167440 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.9",
+    "@pharmatech/sdk": "^0.4.11",
     "@reduxjs/toolkit": "^2.6.1",
     "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",
diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 3fb2893..e225502 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -1,19 +1,11 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useCallback, useMemo } from 'react';
 import { View, StyleSheet } from 'react-native';
 import PoppinsText from './PoppinsText';
 import Input from './Input';
 import { FontSizes, Colors } from '../styles/theme';
 import Dropdown from './Dropdown';
 
-const PaymentInfoForm = ({
-  paymentMethod,
-  total,
-  onValidationChange,
-  onBankChange,
-  onReferenceChange,
-  onDocumentNumberChange,
-  onPhoneChange,
-}: {
+interface Props {
   paymentMethod:
     | 'punto_de_venta'
     | 'efectivo'
@@ -26,6 +18,16 @@ const PaymentInfoForm = ({
   onReferenceChange: (value: string) => void;
   onDocumentNumberChange: (value: string) => void;
   onPhoneChange: (value: string) => void;
+}
+
+const PaymentInfoForm: React.FC<Props> = ({
+  paymentMethod,
+  total,
+  onValidationChange,
+  onBankChange,
+  onReferenceChange,
+  onDocumentNumberChange,
+  onPhoneChange,
 }) => {
   const [bank, setBank] = useState('');
   const [hasBankTouched, setHasBankTouched] = useState(false);
@@ -33,22 +35,42 @@ const PaymentInfoForm = ({
   const [documentNumber, setDocumentNumber] = useState('');
   const [phone, setPhone] = useState('');
 
+  // Memoized handlers
+  const handleBankSelect = useCallback((val: string) => {
+    setBank(val);
+    setHasBankTouched(true);
+  }, []);
+
+  const handleReferenceChange = useCallback((val: string) => {
+    setReference(val.replace(/\D/g, ''));
+  }, []);
+
+  const handleDocumentNumberChange = useCallback((val: string) => {
+    setDocumentNumber(val.replace(/\D/g, '').slice(0, 8));
+  }, []);
+
+  const handlePhoneChange = useCallback((val: string) => {
+    setPhone(val.replace(/\D/g, '').slice(0, 11));
+  }, []);
+
+  // Sync up with parent callbacks
   useEffect(() => {
     onBankChange(bank);
-  }, [bank]);
+  }, [bank, onBankChange]);
 
   useEffect(() => {
     onReferenceChange(reference);
-  }, [reference]);
+  }, [reference, onReferenceChange]);
 
   useEffect(() => {
     onDocumentNumberChange(documentNumber);
-  }, [documentNumber]);
+  }, [documentNumber, onDocumentNumberChange]);
 
   useEffect(() => {
     onPhoneChange(phone);
-  }, [phone]);
+  }, [phone, onPhoneChange]);
 
+  // Validation effect
   useEffect(() => {
     const isValid =
       paymentMethod !== null &&
@@ -61,21 +83,33 @@ const PaymentInfoForm = ({
         : true;
 
     onValidationChange(isValid);
-  }, [bank, reference, documentNumber, phone, paymentMethod]);
+  }, [
+    bank,
+    reference,
+    documentNumber,
+    phone,
+    paymentMethod,
+    onValidationChange,
+  ]);
 
   if (!paymentMethod) {
     return null;
   }
 
-  const staticInputProps = {
-    isEditable: false,
-    backgroundColor: Colors.gray_100,
-    border: 'default' as const,
-  };
+  // Memoized props to avoid recreating objects
+  const staticInputProps = useMemo(
+    () => ({
+      isEditable: false,
+      backgroundColor: Colors.gray_100,
+      border: 'default' as const,
+    }),
+    [],
+  );
 
-  const editableInputProps = {
-    backgroundColor: Colors.iconWhite,
-  };
+  const editableInputProps = useMemo(
+    () => ({ backgroundColor: Colors.iconWhite }),
+    [],
+  );
 
   return (
     <View style={styles.container}>
@@ -132,10 +166,7 @@ const PaymentInfoForm = ({
             label="Banco"
             placeholder="Seleccione el Banco Emisor"
             options={['Banesco', 'Provincial', 'Mercantil']}
-            onSelect={(val) => {
-              setBank(val);
-              setHasBankTouched(true);
-            }}
+            onSelect={handleBankSelect}
             border="default"
             borderColor={
               hasBankTouched && bank === ''
@@ -159,7 +190,7 @@ const PaymentInfoForm = ({
             label="Referencia"
             value={reference}
             placeholder="Ingrese la referencia"
-            getValue={(val) => setReference(val.replace(/\D/g, ''))}
+            getValue={handleReferenceChange}
             fieldType="number"
             errorText="Debe ser un número válido"
             validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
@@ -171,9 +202,7 @@ const PaymentInfoForm = ({
             label="Número de documento"
             placeholder="Ingrese el número de documento"
             value={documentNumber}
-            getValue={(val) =>
-              setDocumentNumber(val.replace(/\D/g, '').slice(0, 8))
-            }
+            getValue={handleDocumentNumberChange}
             fieldType="number"
             errorText="El campo no debe estar vacío"
             validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
@@ -185,7 +214,7 @@ const PaymentInfoForm = ({
             label="Teléfono"
             placeholder="Ingrese el teléfono"
             value={phone}
-            getValue={(val) => setPhone(val.replace(/\D/g, '').slice(0, 11))}
+            getValue={handlePhoneChange}
             fieldType="number"
             errorText="Debe tener exactamente 11 dígitos"
             validation={(val) => /^\d{11}$/.test(val)}
@@ -230,4 +259,4 @@ const styles = StyleSheet.create({
   },
 });
 
-export default PaymentInfoForm;
+export default React.memo(PaymentInfoForm);
diff --git a/src/components/PaymentMethods.tsx b/src/components/PaymentMethods.tsx
index f6f3224..b5c90cc 100644
--- a/src/components/PaymentMethods.tsx
+++ b/src/components/PaymentMethods.tsx
@@ -4,6 +4,8 @@ import RadioButton from './RadioButton';
 import PoppinsText from './PoppinsText';
 import { Colors } from '../styles/theme';
 import { PaymentMethod } from '@pharmatech/sdk';
+import { useDispatch } from 'react-redux';
+import { setPaymentInfoValid } from '../redux/slices/checkoutSlice';
 
 type PaymentOptionValue =
   | 'punto_de_venta'
@@ -43,12 +45,23 @@ const PaymentMethods: React.FC<PaymentMethodsProps> = ({
   selectedPayment,
   setSelectedPayment,
 }) => {
+  const dispatch = useDispatch();
+
+  // Filtramos según pickup vs delivery
   const filtered = ALL_METHODS.filter((m) => {
     if (selectedOption === 'pickup' && m === PaymentMethod.CASH) return false;
     if (selectedOption === 'delivery' && m === PaymentMethod.CARD) return false;
     return true;
   });
 
+  // Cuando el usuario elige un método:
+  const onPaymentChange = (value: string) => {
+    const v = value as PaymentOptionValue;
+    setSelectedPayment(v);
+    // Marcamos el formulario de pago como válido para avanzar
+    dispatch(setPaymentInfoValid(true));
+  };
+
   return (
     <View style={styles.container}>
       <PoppinsText style={styles.title}>
@@ -64,9 +77,7 @@ const PaymentMethods: React.FC<PaymentMethodsProps> = ({
               label={labelMap[m]}
               value={uiValue}
               selectedValue={selectedPayment ?? ''}
-              onValueChange={(value) =>
-                setSelectedPayment(value as PaymentOptionValue)
-              }
+              onValueChange={onPaymentChange}
             />
           </View>
         );
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index f2d037e..7f19577 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -176,7 +176,7 @@ const CheckoutScreen = () => {
       dispatch(setStep(step + 1));
     } else if (step === stepsLabels.length - 1) {
       // Ensure payment form is valid before creating the order
-      if (!paymentInfoValid) {
+      if (!isSimplifiedSteps && !paymentInfoValid) {
         setPopupMessages(['Completar la información de pago correctamente.']);
         setPopupVisible(true);
         return;

From 47a6f2579b8451848ee4a49ed315402a99529511 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 29 Apr 2025 19:46:31 -0400
Subject: [PATCH 176/291] Fetch bank options from PharmaTech SDK and update
 Dropdown options in PaymentInfoForm

---
 src/components/PaymentInfoForm.tsx | 18 +++++++++++++++++-
 1 file changed, 17 insertions(+), 1 deletion(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index e225502..a0d9d53 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -4,6 +4,7 @@ import PoppinsText from './PoppinsText';
 import Input from './Input';
 import { FontSizes, Colors } from '../styles/theme';
 import Dropdown from './Dropdown';
+import { PharmaTech } from '@pharmatech/sdk';
 
 interface Props {
   paymentMethod:
@@ -34,6 +35,21 @@ const PaymentInfoForm: React.FC<Props> = ({
   const [reference, setReference] = useState('');
   const [documentNumber, setDocumentNumber] = useState('');
   const [phone, setPhone] = useState('');
+  const [bankOptions, setBankOptions] = useState<string[]>([]);
+
+  // Fetch bank options from SDK
+  useEffect(() => {
+    const fetchBanks = async () => {
+      try {
+        const sdk = PharmaTech.getInstance();
+        const banks = sdk.bank.findAll();
+        setBankOptions(banks);
+      } catch (error) {
+        console.error('Error fetching banks:', error);
+      }
+    };
+    fetchBanks();
+  }, []);
 
   // Memoized handlers
   const handleBankSelect = useCallback((val: string) => {
@@ -165,7 +181,7 @@ const PaymentInfoForm: React.FC<Props> = ({
           <Dropdown
             label="Banco"
             placeholder="Seleccione el Banco Emisor"
-            options={['Banesco', 'Provincial', 'Mercantil']}
+            options={bankOptions}
             onSelect={handleBankSelect}
             border="default"
             borderColor={

From f7494b77673b6d1b13e72e4375a05ee1dcd9fb3d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 12:17:21 -0400
Subject: [PATCH 177/291] Enhance NotificationsScreen layout

---
 package-lock.json                   |   9 +-
 package.json                        |   2 +-
 src/app/_layout.tsx                 |   6 +-
 src/components/TopBar.tsx           |   1 +
 src/screens/NotificationsScreen.tsx | 178 +++++++++++++++++++---------
 5 files changed, 130 insertions(+), 66 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10c5769..9d1bada 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.9",
+        "@pharmatech/sdk": "^0.4.11",
         "@reduxjs/toolkit": "^2.6.1",
         "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
@@ -4023,10 +4023,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.9.tgz",
-      "integrity": "sha512-E0UKWSs1R8CEXCxHSqmVFvlNcYg8xcPJrTQVDAUnrMeAIBBVBck4gg9ymXYIAVlbMzhpxoSVBQB5zWreFzNoUw==",
-      "license": "MIT",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
+      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 8e5ab7d..e167440 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.9",
+    "@pharmatech/sdk": "^0.4.11",
     "@reduxjs/toolkit": "^2.6.1",
     "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 903217d..21b4c8c 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -76,7 +76,11 @@ export default function RootLayout() {
         />
         <Stack.Screen
           name="notifications"
-          options={{ headerTitle: '', headerTransparent: true }}
+          options={{
+            headerShown: false,
+            headerTransparent: false,
+            headerTitle: '',
+          }}
         />
         <Stack.Screen
           name="menu"
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index bca5aac..c945f76 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -161,6 +161,7 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center',
+    marginLeft: 55,
   },
   iconButton: {
     paddingRight: 4,
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index efcf2b6..8c2fbe8 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -1,45 +1,76 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView, Image } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
-import { NotificationService } from '../services/notifications';
-import { NotificationResponse } from '@pharmatech/sdk';
+import TopBar from '../components/TopBar';
+import Return from '../components/Return';
+import { useNavigation } from '@react-navigation/native';
+import {
+  formatDistanceToNow,
+  parseISO,
+  differenceInDays,
+  format,
+} from 'date-fns';
+import { es } from 'date-fns/locale';
+import NotificationIcon from '../assets/images/favicon.png'; // Import the image
 
 export default function NotificationsScreen() {
-  const [notificationsList, setNotificationsList] = useState<
-    Partial<NotificationResponse>[] | undefined
-  >([
+  const [notificationsList, setNotificationsList] = useState([
     {
-      title: 'Notificacion',
-      message: 'Esta es una notificacion',
-      date: 'pepe',
+      title: 'Notificación 1',
+      message: 'Mensaje de la notificación 1',
+      date: '2025-04-29',
+    },
+    {
+      title: 'Notificación 2',
+      message: 'Mensaje de la notificación 2',
+      date: '2025-03-02',
+    },
+    {
+      title: 'Notificación 3',
+      message: 'Mensaje de la notificación 3',
+      date: '2023-10-03',
     },
   ]);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
-  const [errorMessage, setErrorMessage] = useState('');
+  const [errorMessage] = useState('');
+  const navigation = useNavigation();
 
   useEffect(() => {
-    const fetchOrders = async () => {
-      try {
-        const notifications = await NotificationService.getNotifications();
-        if (notifications.success) {
-          if (notifications.data.results.length > 0) {
-            setNotificationsList(notifications.data.results);
-          }
-        }
-      } catch (error) {
-        console.log(error);
-        setErrorMessage('Ha ocurrido un error');
-        setShowErrorAlert(true);
-      }
-    };
-
-    fetchOrders();
+    setNotificationsList([
+      {
+        title: 'Notificación 1',
+        message: 'Mensaje de la notificación 1',
+        date: '2025-04-29',
+      },
+      {
+        title: 'Notificación 2',
+        message: 'Mensaje de la notificación 2',
+        date: '2025-03-02',
+      },
+      {
+        title: 'Notificación 3',
+        message: 'Mensaje de la notificación 3',
+        date: '2023-10-03',
+      },
+    ]);
   }, []);
 
+  const formatRelativeDate = (dateString: string) => {
+    const date = parseISO(dateString);
+    const daysDifference = differenceInDays(new Date(), date);
+
+    if (daysDifference <= 7) {
+      return formatDistanceToNow(date, { locale: es, addSuffix: true });
+    } else {
+      return format(date, 'yyyy-MM-dd', { locale: es });
+    }
+  };
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
+      <TopBar />
       <View style={styles.alertContainer}>
         {showErrorAlert && (
           <Alert
@@ -52,25 +83,47 @@ export default function NotificationsScreen() {
         )}
       </View>
       <View style={styles.orderHeader}>
-        <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
-          Notificaciones
-        </PoppinsText>
+        <View
+          style={[
+            styles.headerContent,
+            { justifyContent: 'flex-start', marginLeft: 20 },
+          ]}
+        >
+          <Return onClose={() => navigation.goBack()} />
+          <PoppinsText
+            style={{
+              fontSize: FontSizes.s1.size,
+              marginLeft: 50,
+              color: Colors.textMain,
+            }}
+          >
+            Notificaciones
+          </PoppinsText>
+        </View>
       </View>
       <View style={styles.orderInfo}>
-        {notificationsList &&
-          notificationsList.length > 0 &&
-          notificationsList.map((nt, index) => (
-            <View
-              key={index}
-              style={{
-                flexDirection: 'row',
-                paddingHorizontal: 10,
-                marginVertical: 5,
-              }}
-            >
-              <View></View>
-              <View style={{ paddingVertical: 10, flex: 1 }}>
-                <View>
+        <ScrollView
+          style={styles.notificationsScroll}
+          contentContainerStyle={styles.notificationsContainer}
+        >
+          {notificationsList &&
+            notificationsList.length > 0 &&
+            notificationsList.map((nt, index) => (
+              <View
+                key={index}
+                style={{
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                  paddingHorizontal: 10,
+                  paddingVertical: 12,
+                  marginVertical: 5,
+                }}
+              >
+                <Image
+                  source={NotificationIcon} // Use the imported image
+                  style={{ width: 32, height: 32, marginRight: 10 }}
+                />
+                <View style={{ flex: 1 }}>
                   <View
                     style={{
                       flexDirection: 'row',
@@ -84,23 +137,21 @@ export default function NotificationsScreen() {
                         fontSize: FontSizes.c1.size,
                       }}
                     >
-                      {nt.date}
-                    </PoppinsText>
-                  </View>
-                  <View>
-                    <PoppinsText
-                      style={{
-                        color: Colors.textLowContrast,
-                        fontSize: FontSizes.c1.size,
-                      }}
-                    >
-                      {nt.message}
+                      {formatRelativeDate(nt.date)}
                     </PoppinsText>
                   </View>
+                  <PoppinsText
+                    style={{
+                      color: Colors.textLowContrast,
+                      fontSize: FontSizes.c1.size,
+                    }}
+                  >
+                    {nt.message}
+                  </PoppinsText>
                 </View>
               </View>
-            </View>
-          ))}
+            ))}
+        </ScrollView>
       </View>
     </ScrollView>
   );
@@ -110,7 +161,6 @@ const styles = StyleSheet.create({
   container: {
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
-    padding: 20,
   },
   alertContainer: {
     position: 'absolute',
@@ -122,9 +172,12 @@ const styles = StyleSheet.create({
     zIndex: 1000,
   },
   orderHeader: {
+    marginTop: 15,
+  },
+  headerContent: {
+    flexDirection: 'row',
     alignItems: 'center',
-    marginTop: 30,
-    marginBottom: 15,
+    justifyContent: 'center',
   },
   orderImage: {
     width: 120,
@@ -144,6 +197,7 @@ const styles = StyleSheet.create({
   },
   orderInfo: {
     marginVertical: 5,
+    padding: 20,
   },
   fieldContainer: {
     marginBottom: 15,
@@ -170,4 +224,10 @@ const styles = StyleSheet.create({
     width: '50%',
     alignItems: 'center',
   },
+  notificationsScroll: {
+    maxHeight: 400,
+  },
+  notificationsContainer: {
+    paddingBottom: 20,
+  },
 });

From d2195c05f07489e8fae591801d4ef980ca777500 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 13:13:32 -0400
Subject: [PATCH 178/291] Refactor NotificationsScreen to fetch notifications
 from the server and improve loading state handling

---
 src/screens/NotificationsScreen.tsx | 317 +++++++++++++---------------
 1 file changed, 141 insertions(+), 176 deletions(-)

diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 8c2fbe8..c012770 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -1,10 +1,12 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, Image } from 'react-native';
-import { Colors, FontSizes } from '../styles/theme';
-import PoppinsText from '../components/PoppinsText';
-import Alert from '../components/Alerts';
-import TopBar from '../components/TopBar';
-import Return from '../components/Return';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  Image,
+  ActivityIndicator,
+  TouchableOpacity,
+} from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import {
   formatDistanceToNow,
@@ -13,66 +15,82 @@ import {
   format,
 } from 'date-fns';
 import { es } from 'date-fns/locale';
-import NotificationIcon from '../assets/images/favicon.png'; // Import the image
+
+import TopBar from '../components/TopBar';
+import Return from '../components/Return';
+import PoppinsText from '../components/PoppinsText';
+import Alert from '../components/Alerts';
+import NotificationIcon from '../assets/images/favicon.png';
+import { Colors, FontSizes } from '../styles/theme';
+import { NotificationService } from '../services/notifications';
+import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 
 export default function NotificationsScreen() {
-  const [notificationsList, setNotificationsList] = useState([
-    {
-      title: 'Notificación 1',
-      message: 'Mensaje de la notificación 1',
-      date: '2025-04-29',
-    },
-    {
-      title: 'Notificación 2',
-      message: 'Mensaje de la notificación 2',
-      date: '2025-03-02',
-    },
-    {
-      title: 'Notificación 3',
-      message: 'Mensaje de la notificación 3',
-      date: '2023-10-03',
-    },
-  ]);
-  const [showErrorAlert, setShowErrorAlert] = useState(false);
-  const [errorMessage] = useState('');
   const navigation = useNavigation();
 
+  const [notificationsList, setNotificationsList] = useState<
+    Array<{
+      id: string;
+      title: string;
+      message: string;
+      createdAt: string;
+    }>
+  >([]);
+  const [loading, setLoading] = useState(true);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+
   useEffect(() => {
-    setNotificationsList([
-      {
-        title: 'Notificación 1',
-        message: 'Mensaje de la notificación 1',
-        date: '2025-04-29',
-      },
-      {
-        title: 'Notificación 2',
-        message: 'Mensaje de la notificación 2',
-        date: '2025-03-02',
-      },
-      {
-        title: 'Notificación 3',
-        message: 'Mensaje de la notificación 3',
-        date: '2023-10-03',
-      },
-    ]);
+    const fetchNotifications = async () => {
+      setLoading(true);
+      setShowErrorAlert(false);
+      try {
+        const token = await getUserIdFromSecureStore();
+        if (!token) throw new Error('No se pudo obtener el token de usuario.');
+
+        const res = await NotificationService.getNotifications();
+        if (res.success && res.data && Array.isArray(res.data)) {
+          setNotificationsList(
+            res.data.map((nt) => ({
+              id: nt.id,
+              title: nt.title,
+              message: nt.message,
+              createdAt: nt.createdAt,
+            })),
+          );
+        } else {
+          throw new Error('Respuesta inesperada del servidor');
+        }
+      } catch (err: unknown) {
+        if (err instanceof Error) {
+          setErrorMessage(err.message);
+        } else {
+          setErrorMessage('Ocurrió un error desconocido.');
+        }
+        setShowErrorAlert(true);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchNotifications();
   }, []);
 
   const formatRelativeDate = (dateString: string) => {
     const date = parseISO(dateString);
-    const daysDifference = differenceInDays(new Date(), date);
-
-    if (daysDifference <= 7) {
+    const daysDiff = differenceInDays(new Date(), date);
+    if (daysDiff <= 7) {
       return formatDistanceToNow(date, { locale: es, addSuffix: true });
-    } else {
-      return format(date, 'yyyy-MM-dd', { locale: es });
     }
+    return format(date, 'yyyy-MM-dd', { locale: es });
   };
 
   return (
-    <ScrollView contentContainerStyle={styles.container}>
+    <View style={styles.container}>
       <TopBar />
-      <View style={styles.alertContainer}>
-        {showErrorAlert && (
+
+      {showErrorAlert && (
+        <View style={styles.alertContainer}>
           <Alert
             type="error"
             title="Error"
@@ -80,154 +98,101 @@ export default function NotificationsScreen() {
             onClose={() => setShowErrorAlert(false)}
             borderColor
           />
-        )}
-      </View>
-      <View style={styles.orderHeader}>
-        <View
-          style={[
-            styles.headerContent,
-            { justifyContent: 'flex-start', marginLeft: 20 },
-          ]}
-        >
-          <Return onClose={() => navigation.goBack()} />
-          <PoppinsText
-            style={{
-              fontSize: FontSizes.s1.size,
-              marginLeft: 50,
-              color: Colors.textMain,
-            }}
-          >
-            Notificaciones
-          </PoppinsText>
         </View>
+      )}
+
+      <View style={styles.header}>
+        <Return onClose={() => navigation.goBack()} />
+        <PoppinsText style={styles.title}>Notificaciones</PoppinsText>
       </View>
-      <View style={styles.orderInfo}>
-        <ScrollView
-          style={styles.notificationsScroll}
-          contentContainerStyle={styles.notificationsContainer}
-        >
-          {notificationsList &&
-            notificationsList.length > 0 &&
-            notificationsList.map((nt, index) => (
-              <View
-                key={index}
-                style={{
-                  flexDirection: 'row',
-                  alignItems: 'center',
-                  paddingHorizontal: 10,
-                  paddingVertical: 12,
-                  marginVertical: 5,
-                }}
-              >
-                <Image
-                  source={NotificationIcon} // Use the imported image
-                  style={{ width: 32, height: 32, marginRight: 10 }}
-                />
-                <View style={{ flex: 1 }}>
-                  <View
-                    style={{
-                      flexDirection: 'row',
-                      justifyContent: 'space-between',
-                    }}
-                  >
-                    <PoppinsText>{nt.title}</PoppinsText>
-                    <PoppinsText
-                      style={{
-                        color: Colors.textLowContrast,
-                        fontSize: FontSizes.c1.size,
-                      }}
-                    >
-                      {formatRelativeDate(nt.date)}
-                    </PoppinsText>
-                  </View>
-                  <PoppinsText
-                    style={{
-                      color: Colors.textLowContrast,
-                      fontSize: FontSizes.c1.size,
-                    }}
-                  >
-                    {nt.message}
+
+      {loading ? (
+        <ActivityIndicator
+          size="large"
+          color={Colors.primary}
+          style={styles.loader}
+        />
+      ) : notificationsList.length === 0 ? (
+        <View style={styles.emptyContainer}>
+          <PoppinsText>No tienes notificaciones pendientes.</PoppinsText>
+        </View>
+      ) : (
+        <ScrollView contentContainerStyle={styles.listContainer}>
+          {notificationsList.map((nt) => (
+            <TouchableOpacity
+              key={nt.id}
+              style={styles.item}
+              onPress={() => {
+                /* TODO: navegar a detalle o marcar como leído */
+              }}
+            >
+              <Image source={NotificationIcon} style={styles.icon} />
+              <View style={styles.textContainer}>
+                <View style={styles.itemHeader}>
+                  <PoppinsText weight="semibold">{nt.title}</PoppinsText>
+                  <PoppinsText style={styles.date}>
+                    {formatRelativeDate(nt.createdAt)}
                   </PoppinsText>
                 </View>
+                <PoppinsText style={styles.message}>{nt.message}</PoppinsText>
               </View>
-            ))}
+            </TouchableOpacity>
+          ))}
         </ScrollView>
-      </View>
-    </ScrollView>
+      )}
+    </View>
   );
 }
 
 const styles = StyleSheet.create({
-  container: {
-    flexGrow: 1,
-    backgroundColor: Colors.bgColor,
-  },
+  container: { flex: 1, backgroundColor: Colors.bgColor },
   alertContainer: {
     position: 'absolute',
-    width: 326,
-    left: '50%',
-    marginLeft: -162,
     top: 20,
-    right: 0,
+    left: '50%',
+    transform: [{ translateX: -162 }],
+    width: 326,
     zIndex: 1000,
   },
-  orderHeader: {
-    marginTop: 15,
-  },
-  headerContent: {
+  header: {
     flexDirection: 'row',
     alignItems: 'center',
-    justifyContent: 'center',
-  },
-  orderImage: {
-    width: 120,
-    height: 120,
-    borderRadius: 60,
-    marginBottom: 15,
-    borderWidth: 2,
-    borderColor: '#e0e0e0',
-  },
-  editButton: {
-    paddingVertical: 10,
     paddingHorizontal: 20,
-    borderRadius: 20,
-  },
-  editButtonText: {
-    color: Colors.primary,
-  },
-  orderInfo: {
-    marginVertical: 5,
-    padding: 20,
+    paddingTop: 15,
   },
-  fieldContainer: {
-    marginBottom: 15,
+  title: {
+    fontSize: FontSizes.s1.size,
+    marginLeft: 20,
+    color: Colors.textMain,
   },
-  fieldLabel: {
-    fontSize: 14,
-    color: '#666',
-    marginBottom: 5,
-  },
-  fieldValue: {
-    fontSize: 18,
-    color: '#333',
-    marginBottom: 10,
+  loader: { marginTop: 40 },
+  emptyContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
-  separator: {
-    height: 1,
-    backgroundColor: '#e0e0e0',
-    marginBottom: 15,
+  listContainer: { paddingVertical: 10 },
+  item: {
+    flexDirection: 'row',
+    alignItems: 'flex-start',
+    paddingHorizontal: 20,
+    paddingVertical: 12,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.bgColor,
   },
-  bottomEditButton: {
-    alignSelf: 'center',
-    marginTop: 20,
-    marginBottom: 40,
-    width: '50%',
-    alignItems: 'center',
+  icon: { width: 32, height: 32, marginRight: 12, marginTop: 4 },
+  textContainer: { flex: 1 },
+  itemHeader: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginBottom: 4,
   },
-  notificationsScroll: {
-    maxHeight: 400,
+  date: {
+    color: Colors.textLowContrast,
+    fontSize: FontSizes.c1.size,
   },
-  notificationsContainer: {
-    paddingBottom: 20,
+  message: {
+    color: Colors.textLowContrast,
+    fontSize: FontSizes.c1.size,
   },
 });

From d010e891b0d8996e30f3b3255b2bff69148541e3 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 14:11:48 -0400
Subject: [PATCH 179/291] @pharmatech/sdk dependency version to 0.4.9 in
 package.json and package-lock.json

---
 package-lock.json | 19 ++++++++-----------
 package.json      |  2 +-
 2 files changed, 9 insertions(+), 12 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 9d1bada..d5316b2 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.11",
+        "@pharmatech/sdk": "^0.4.9",
         "@reduxjs/toolkit": "^2.6.1",
         "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
@@ -4023,9 +4023,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
-      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
+      "version": "0.4.9",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.9.tgz",
+      "integrity": "sha512-E0UKWSs1R8CEXCxHSqmVFvlNcYg8xcPJrTQVDAUnrMeAIBBVBck4gg9ymXYIAVlbMzhpxoSVBQB5zWreFzNoUw==",
       "dependencies": {
         "axios": "^1.8.1"
       }
@@ -6312,10 +6312,9 @@
       }
     },
     "node_modules/axios": {
-      "version": "1.8.4",
-      "resolved": "https://registry.npmjs.org/axios/-/axios-1.8.4.tgz",
-      "integrity": "sha512-eBSYY4Y68NNlHbHBMdeDmKNtDgXWhQsJcGqzO3iLUM0GraQFSS9cVgPX5I9b3lbdFKyYoAEGAZF1DwhTaljNAw==",
-      "license": "MIT",
+      "version": "1.9.0",
+      "resolved": "https://registry.npmjs.org/axios/-/axios-1.9.0.tgz",
+      "integrity": "sha512-re4CqKTJaURpzbLHtIi6XpDv20/CnpXOtjRY5/CU32L8gU8ek9UIivcfvSWvmKEngmVbrUtPpdDwWDWL7DNHvg==",
       "dependencies": {
         "follow-redirects": "^1.15.6",
         "form-data": "^4.0.0",
@@ -6326,7 +6325,6 @@
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
       "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
-      "license": "MIT",
       "dependencies": {
         "asynckit": "^0.4.0",
         "combined-stream": "^1.0.8",
@@ -18687,8 +18685,7 @@
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
-      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==",
-      "license": "MIT"
+      "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
     "node_modules/prr": {
       "version": "1.0.1",
diff --git a/package.json b/package.json
index e167440..8e5ab7d 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.11",
+    "@pharmatech/sdk": "^0.4.9",
     "@reduxjs/toolkit": "^2.6.1",
     "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",

From ca02993740498a7e60dbceed869432594025f7f7 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 30 Apr 2025 16:01:02 -0400
Subject: [PATCH 180/291] Fixing filter styles

---
 package-lock.json                   |  18 +++
 package.json                        |   2 +
 src/app/(tabs)/_layout.tsx          |  11 ++
 src/components/FilterOptions.tsx    | 184 +++++++++++++++++----
 src/components/SearchInput.tsx      | 106 ++++++++-----
 src/screens/ProductDetailScreen.tsx |   4 +-
 src/screens/SearchProductScreen.tsx | 237 ++++++++++++++--------------
 src/screens/SplashScreen.tsx        |   2 +-
 src/services/user.ts                |   2 +-
 9 files changed, 381 insertions(+), 185 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 10c5769..103bcc6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -10,6 +10,8 @@
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
         "@pharmatech/sdk": "^0.4.9",
+        "@ptomasroos/react-native-multi-slider": "^2.2.2",
+        "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
         "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
@@ -4040,6 +4042,16 @@
         "node": ">=14"
       }
     },
+    "node_modules/@ptomasroos/react-native-multi-slider": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/@ptomasroos/react-native-multi-slider/-/react-native-multi-slider-2.2.2.tgz",
+      "integrity": "sha512-HWyCnRD3Z3SbHK2FLWYmBBqd1B4iXipeKv1+AK0FoY/CElEDTEixHE8hN60TsqxalPrznn798LE2Q4tHuCiyaA==",
+      "license": "MIT",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
+      }
+    },
     "node_modules/@radix-ui/react-compose-refs": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/@radix-ui/react-compose-refs/-/react-compose-refs-1.0.0.tgz",
@@ -4065,6 +4077,12 @@
         "react": "^16.8 || ^17.0 || ^18.0"
       }
     },
+    "node_modules/@react-native-community/slider": {
+      "version": "4.5.6",
+      "resolved": "https://registry.npmjs.org/@react-native-community/slider/-/slider-4.5.6.tgz",
+      "integrity": "sha512-UhLPFeqx0YfPLrEz8ffT3uqAyXWu6iqFjohNsbp4cOU7hnJwg2RXtDnYHoHMr7MOkZDVdlLMdrSrAuzY6KGqrg==",
+      "license": "MIT"
+    },
     "node_modules/@react-native/assets-registry": {
       "version": "0.76.7",
       "resolved": "https://registry.npmjs.org/@react-native/assets-registry/-/assets-registry-0.76.7.tgz",
diff --git a/package.json b/package.json
index 8e5ab7d..644e82e 100644
--- a/package.json
+++ b/package.json
@@ -20,6 +20,8 @@
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
     "@pharmatech/sdk": "^0.4.9",
+    "@ptomasroos/react-native-multi-slider": "^2.2.2",
+    "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
     "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",
diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx
index c403537..ae1c79b 100644
--- a/src/app/(tabs)/_layout.tsx
+++ b/src/app/(tabs)/_layout.tsx
@@ -19,6 +19,17 @@ export default function TabLayout() {
         screenOptions={{
           tabBarActiveTintColor: Colors.primary,
           tabBarStyle: { backgroundColor: Colors.secondaryWhite },
+          tabBarHideOnKeyboard: true,
+          tabBarVisibilityAnimationConfig: {
+            show: {
+              animation: 'timing',
+              config: { duration: 0 },
+            },
+            hide: {
+              animation: 'timing',
+              config: { duration: 0 },
+            },
+          },
         }}
       >
         <Tabs.Screen
diff --git a/src/components/FilterOptions.tsx b/src/components/FilterOptions.tsx
index ef7c865..a3752c6 100644
--- a/src/components/FilterOptions.tsx
+++ b/src/components/FilterOptions.tsx
@@ -1,4 +1,4 @@
-import React, { useRef } from 'react';
+import React, { useRef, useState } from 'react';
 import {
   View,
   StyleSheet,
@@ -7,22 +7,34 @@ import {
   Dimensions,
   TouchableWithoutFeedback,
   Modal,
+  ScrollView,
 } from 'react-native';
-import { Colors } from '../styles/theme';
+import { Colors, FontSizes } from '../styles/theme';
+import { AdjustmentsHorizontalIcon } from 'react-native-heroicons/solid';
+import PoppinsText from './PoppinsText';
+import Button from './Button';
+import MultiSlider from '@ptomasroos/react-native-multi-slider';
 
 type FilterOptionsProps = {
   visible: boolean;
   onClose: () => void;
+  onClearFilters: () => void;
+  onApplyFilters: (priceRange: { min: number; max: number }) => void;
   children: React.ReactNode;
 };
 
 const FilterOptions: React.FC<FilterOptionsProps> = ({
   visible,
   onClose,
+  onClearFilters,
+  onApplyFilters,
   children,
 }) => {
   const screenHeight = Dimensions.get('screen').height;
   const panY = useRef(new Animated.Value(screenHeight)).current;
+  const scrollOffset = useRef(0);
+
+  const [priceRange, setPriceRange] = useState({ min: 0, max: 1000 });
 
   const resetPositionAnim = Animated.timing(panY, {
     toValue: 0,
@@ -38,13 +50,18 @@ const FilterOptions: React.FC<FilterOptionsProps> = ({
 
   const panResponders = useRef(
     PanResponder.create({
-      onStartShouldSetPanResponder: () => true,
-      onMoveShouldSetPanResponder: () => false,
-      onPanResponderMove: Animated.event([null, { dy: panY }], {
-        useNativeDriver: false,
-      }),
-      onPanResponderRelease: (_, gs) => {
-        if (gs.dy > 0 && gs.vy > 0.5) {
+      onStartShouldSetPanResponder: (_, gestureState) => {
+        return scrollOffset.current <= 0 && gestureState.dy > 0;
+      },
+      onMoveShouldSetPanResponder: (_, gestureState) => {
+        return scrollOffset.current <= 0 && gestureState.dy > 0;
+      },
+      onPanResponderMove: (_, gestureState) => {
+        const newY = Math.max(gestureState.dy, 0);
+        panY.setValue(newY);
+      },
+      onPanResponderRelease: (_, gestureState) => {
+        if (gestureState.dy > 200 || gestureState.vy > 1) {
           return closeSheet();
         }
         return resetPositionAnim.start();
@@ -64,6 +81,11 @@ const FilterOptions: React.FC<FilterOptionsProps> = ({
     closeAnim.start(() => onClose());
   };
 
+  const handleApplyFilters = () => {
+    onApplyFilters(priceRange);
+    closeSheet();
+  };
+
   return (
     <Modal
       animated
@@ -72,21 +94,85 @@ const FilterOptions: React.FC<FilterOptionsProps> = ({
       transparent
       onRequestClose={closeSheet}
     >
-      <TouchableWithoutFeedback onPress={closeSheet}>
+      <TouchableWithoutFeedback onPress={() => {}}>
         <View style={styles.overlay}>
+          <TouchableWithoutFeedback onPress={closeSheet}>
+            <View style={{ flex: 1 }} />
+          </TouchableWithoutFeedback>
           <Animated.View
-            style={[
-              styles.container,
-              {
-                transform: [{ translateY: panY }],
-              },
-            ]}
+            style={[styles.container, { transform: [{ translateY: panY }] }]}
             {...panResponders.panHandlers}
           >
-            <View style={styles.sliderIndicatorRow}>
-              <View style={styles.sliderIndicator} />
+            {/* Cabecera fija */}
+            <View style={styles.header}>
+              <View style={styles.headerTitleContainer}>
+                <PoppinsText style={styles.headerTitle}>Filtros</PoppinsText>
+                <AdjustmentsHorizontalIcon
+                  size={20}
+                  color={Colors.iconMainDefault}
+                />
+              </View>
+              <TouchableWithoutFeedback onPress={onClearFilters}>
+                <View style={styles.clearButtonContainer}>
+                  <PoppinsText style={styles.clearText}>Limpiar</PoppinsText>
+                </View>
+              </TouchableWithoutFeedback>
+            </View>
+
+            {/* Contenido desplazable */}
+            <ScrollView
+              contentContainerStyle={styles.scrollContent}
+              keyboardShouldPersistTaps="handled"
+              showsVerticalScrollIndicator={true}
+              onScroll={(event) => {
+                scrollOffset.current = event.nativeEvent.contentOffset.y;
+              }}
+              scrollEventThrottle={16}
+            >
+              {children}
+
+              {/* Filtro de precios */}
+              <View style={styles.priceFilterContainer}>
+                <PoppinsText style={styles.priceFilterTitle}>
+                  Rango de precios
+                </PoppinsText>
+                <MultiSlider
+                  values={[priceRange.min, priceRange.max]}
+                  min={0}
+                  max={1000}
+                  step={10}
+                  onValuesChange={(values) =>
+                    setPriceRange({ min: values[0], max: values[1] })
+                  }
+                  selectedStyle={{ backgroundColor: Colors.primary }}
+                  unselectedStyle={{ backgroundColor: Colors.gray_500 }}
+                  markerStyle={{
+                    backgroundColor: Colors.primary,
+                    height: 20,
+                    width: 20,
+                  }}
+                  containerStyle={{ marginHorizontal: 10 }}
+                />
+                <View style={styles.priceLabels}>
+                  <PoppinsText style={styles.priceLabel}>
+                    Min: ${priceRange.min}
+                  </PoppinsText>
+                  <PoppinsText style={styles.priceLabel}>
+                    Max: ${priceRange.max}
+                  </PoppinsText>
+                </View>
+              </View>
+            </ScrollView>
+
+            {/* Botón para aplicar filtros */}
+            <View style={styles.applyButtonContainer}>
+              <Button
+                title="Aplicar filtros"
+                onPress={handleApplyFilters}
+                variant="primary"
+                size="large"
+              />
             </View>
-            {children}
           </Animated.View>
         </View>
       </TouchableWithoutFeedback>
@@ -102,24 +188,64 @@ const styles = StyleSheet.create({
   },
   container: {
     backgroundColor: Colors.bgColor,
-    paddingVertical: 12,
-    paddingHorizontal: 12,
     borderTopRightRadius: 12,
     borderTopLeftRadius: 12,
-    minHeight: 200,
     maxHeight: '80%',
   },
-  sliderIndicatorRow: {
+  header: {
     flexDirection: 'row',
-    marginBottom: 4,
     alignItems: 'center',
+    borderBottomWidth: 1,
+    borderColor: Colors.gray_100,
+    paddingVertical: 10,
+    paddingHorizontal: 20,
     justifyContent: 'center',
   },
-  sliderIndicator: {
-    backgroundColor: '#CECECE',
-    height: 4,
-    width: 45,
-    borderRadius: 2,
+  headerTitleContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    justifyContent: 'center',
+  },
+  headerTitle: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.primary,
+    marginRight: 4,
+  },
+  clearButtonContainer: {
+    position: 'absolute',
+    right: 20,
+  },
+  clearText: {
+    fontSize: FontSizes.label.size,
+    lineHeight: FontSizes.label.lineHeight,
+    color: Colors.iconMainDefault,
+  },
+  scrollContent: {
+    paddingBottom: 20,
+    paddingHorizontal: 20,
+  },
+  priceFilterContainer: {
+    marginTop: 20,
+  },
+  priceFilterTitle: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    marginBottom: 8,
+  },
+  priceLabels: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    marginTop: 8,
+  },
+  priceLabel: {
+    fontSize: 14,
+    color: Colors.textLowContrast,
+  },
+  applyButtonContainer: {
+    padding: 20,
+    borderTopWidth: 1,
+    borderColor: Colors.gray_100,
   },
 });
 
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index b733cc3..6d6418e 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -5,6 +5,7 @@ import {
   StyleSheet,
   TouchableOpacity,
   ScrollView,
+  Image,
 } from 'react-native';
 import {
   ArrowRightIcon,
@@ -37,6 +38,12 @@ const SearchInput: React.FC<SearchInputProps> = ({
   const [search, setSearch] = useState('');
   const [result, setResult] = useState<ProductPresentation[]>();
 
+  const handleSearch = () => {
+    if (search.trim()) {
+      router.push(`/search/${encodeURIComponent(search)}`); // Redirige a la misma ruta para ambas acciones
+    }
+  };
+
   useEffect(() => {
     const fetchQuery = async () => {
       const resultData = await ProductService.getProducts(1, 20, { q: search });
@@ -61,15 +68,21 @@ const SearchInput: React.FC<SearchInputProps> = ({
           style={styles.input}
           placeholder={placeholder}
           placeholderTextColor={Colors.textLowContrast}
-          value={search}
-          onChangeText={(value) => setSearch(value)}
-          returnKeyType="search"
-          onSubmitEditing={onSearchPress}
+          value={value} // Usar el valor que se pasa como prop
+          onChangeText={(text) => {
+            setSearch(text); // Actualizar el estado local
+            onChangeText(text); // Notificar al componente padre
+          }}
+          returnKeyType="search" // Cambiar el botón del teclado a "Buscar"
+          onSubmitEditing={handleSearch}
         />
 
         {showClearButton && value.length > 0 && (
           <TouchableOpacity
-            onPress={() => onChangeText('')}
+            onPress={() => {
+              setSearch('');
+              onChangeText('');
+            }}
             style={styles.clearButton}
             testID="clear-button"
             accessibilityLabel="Limpiar búsqueda"
@@ -119,57 +132,76 @@ const SearchInput: React.FC<SearchInputProps> = ({
                 Productos que coinciden con &quot;{search}&quot;
               </PoppinsText>
             </View>
-            <ScrollView style={{ height: 400 }}>
+            <ScrollView
+              style={{
+                maxHeight: Math.min((result?.length || 0) * 80, 232),
+              }}
+            >
               {result?.map((p, index) => (
                 <TouchableOpacity
                   key={index}
-                  style={{ flexDirection: 'row' }}
+                  style={{
+                    flexDirection: 'row', // Alinea la imagen y el contenido horizontalmente
+                    padding: 8,
+                    borderBottomWidth: 1,
+                    borderColor: Colors.gray_100,
+                  }}
                   onPress={() =>
                     router.push(
                       `/products/${p.product.id}/presentation/${p.presentation.id}`,
                     )
                   }
                 >
-                  <View style={{ width: 130 }}>
+                  {/* Imagen del producto */}
+                  <View style={{ marginRight: 8 }}>
+                    <Image
+                      source={{ uri: p.product.images[0]?.url }}
+                      style={{
+                        width: 60, // Ancho de la imagen
+                        height: 60, // Alto de la imagen
+                        borderRadius: 8, // Bordes redondeados
+                        backgroundColor: Colors.gray_100, // Color de fondo por si no hay imagen
+                      }}
+                      resizeMode="cover"
+                    />
+                  </View>
+
+                  {/* Contenido del producto */}
+                  <View style={{ flex: 1 }}>
                     <PoppinsText
                       style={{
-                        flex: 1,
-                        flexWrap: 'wrap',
                         fontSize: FontSizes.c1.size,
+                        fontWeight: 'bold',
+                        marginBottom: 4,
                       }}
                     >
-                      {p.product.categories[0].name}
+                      {p?.product?.name}
+                    </PoppinsText>
+                    <PoppinsText
+                      style={{
+                        fontSize: FontSizes.c1.size,
+                        color: Colors.textLowContrast,
+                        marginBottom: 4,
+                      }}
+                    >
+                      {p?.presentation?.quantity}{' '}
+                      {p?.presentation?.measurementUnit} -{' '}
+                      {p?.product?.categories[0]?.name}
+                    </PoppinsText>
+                    <PoppinsText
+                      style={{
+                        fontSize: FontSizes.c1.size,
+                        fontWeight: 'bold',
+                        color: Colors.primary,
+                      }}
+                    >
+                      Bs. {p?.price}
                     </PoppinsText>
-                  </View>
-                  <View>
-                    <View></View>
-                    <View style={{ padding: 1 }}>
-                      <PoppinsText
-                        style={{
-                          flex: 1,
-                          flexWrap: 'wrap',
-                          fontSize: FontSizes.c1.size,
-                        }}
-                      >
-                        {p?.product?.name +
-                          ' ' +
-                          p?.presentation?.quantity +
-                          ' ' +
-                          p?.presentation?.measurementUnit +
-                          ' ' +
-                          p?.product?.categories[0].name +
-                          '. ' +
-                          p?.product?.description +
-                          '\n' +
-                          'Bs.' +
-                          p?.price}
-                      </PoppinsText>
-                    </View>
                   </View>
                 </TouchableOpacity>
               ))}
             </ScrollView>
-            <TouchableOpacity onPress={() => router.push(`/search/${search}`)}>
+            <TouchableOpacity onPress={handleSearch}>
               <View
                 style={{
                   flexDirection: 'row',
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index d7878d8..5e5389f 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -30,7 +30,7 @@ import Carousel from '../components/Carousel';
 import { StateService } from '../services/state';
 import { Inventory, State } from '../types/api';
 import { InventoryService } from '../services/inventory';
-import { useNavigation } from '@react-navigation/native'; // Importa el hook de navegación
+import { useNavigation } from '@react-navigation/native';
 import BranchMap from '../components/BranchMap';
 import {
   ProductImage,
@@ -259,7 +259,7 @@ const ProductDetailScreen: React.FC = () => {
           paddingHorizontal: 10,
           marginBottom: -4,
           flexDirection: 'row',
-          alignItems: 'center',
+          alignSelf: 'flex-start',
         }}
       >
         <ChevronLeftIcon
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 5a196eb..714125a 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -7,7 +7,6 @@ import {
   Dimensions,
   FlatList,
   ListRenderItem,
-  ScrollView,
 } from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
@@ -23,10 +22,10 @@ import {
   ProductPresentation,
 } from '@pharmatech/sdk';
 import Checkbox from '../components/Checkbox';
-import Steps from '../components/Steps';
-import Button from '../components/Button';
+import { ChevronLeftIcon } from 'react-native-heroicons/solid';
 import ProductCard from '../components/Card';
 import { CategoryService } from '../services/category';
+import { useNavigation } from '@react-navigation/native';
 
 export default function SearchProductScreen() {
   const { query } = useLocalSearchParams<{ query: string }>();
@@ -36,6 +35,7 @@ export default function SearchProductScreen() {
   const [brands, setBrands] = useState<ManufacturerResponse[]>();
   const [categories, setCategories] = useState<CategoryResponse[]>();
   const [presentations, setPresentations] = useState<PresentationResponse[]>();
+  const navigation = useNavigation();
 
   const [selectedPresentations, setSelectedPresentations] = useState<string[]>(
     [],
@@ -77,14 +77,21 @@ export default function SearchProductScreen() {
   };
 
   const submitFilters = async () => {
-    const searchData = await ProductService.getProducts(1, 20, {
-      q: query,
-      manufacturerId: selectedBrands,
-      categoryId: selectedCategories,
-      presentationId: selectedPresentations,
-    });
+    try {
+      const searchData = await ProductService.getProducts(1, 20, {
+        q: query,
+        manufacturerId: selectedBrands,
+        categoryId: selectedCategories,
+        presentationId: selectedPresentations,
+      });
 
-    if (searchData.success) setSearch(searchData.data.results);
+      if (searchData.success) {
+        // Combinar los resultados actuales con los nuevos resultados
+        setSearch((prev) => [...(prev || []), ...searchData.data.results]);
+      }
+    } catch (error) {
+      console.error('Error al aplicar filtros:', error);
+    }
   };
 
   useEffect(() => {
@@ -128,9 +135,41 @@ export default function SearchProductScreen() {
   );
 
   return (
-    <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+    <SafeAreaView style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
-      <View style={{ flexDirection: 'row', justifyContent: 'center' }}>
+      <TouchableOpacity
+        onPress={() => navigation.goBack()}
+        style={{
+          paddingHorizontal: 10,
+          marginBottom: -4,
+          flexDirection: 'row',
+          alignSelf: 'flex-start',
+        }}
+      >
+        <ChevronLeftIcon
+          width={20}
+          height={20}
+          color={Colors.primary}
+          style={{ marginRight: 2, marginLeft: 6 }}
+        />
+        <PoppinsText
+          weight="medium"
+          style={{
+            fontSize: FontSizes.b1.size,
+            lineHeight: FontSizes.b1.lineHeight,
+            color: Colors.primary,
+          }}
+        >
+          Volver
+        </PoppinsText>
+      </TouchableOpacity>
+      <View
+        style={{
+          flexDirection: 'row',
+          justifyContent: 'center',
+          marginBottom: 10,
+        }}
+      >
         <TouchableOpacity
           style={{ flexDirection: 'row', justifyContent: 'center' }}
           onPress={() => setIsVisible(true)}
@@ -141,117 +180,80 @@ export default function SearchProductScreen() {
           <AdjustmentsHorizontalIcon size={20} color={Colors.iconMainDefault} />
         </TouchableOpacity>
       </View>
-      <View style={{ marginHorizontal: 20 }}>
-        <View style={{ marginVertical: 5 }}>
-          <PoppinsText>Resultados de la búsqueda: {query}</PoppinsText>
-          <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
-            {search?.length} resultados
-          </PoppinsText>
-        </View>
+      <View style={{ marginHorizontal: 20, marginBottom: 10 }}>
+        <PoppinsText>Resultados de la búsqueda: {query}</PoppinsText>
+        <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
+          {search?.length} resultados
+        </PoppinsText>
       </View>
-      <SafeAreaView style={styles.container}>
-        <FlatList
-          data={search}
-          renderItem={renderItem}
-          keyExtractor={(item) => item.id.toString()}
-          numColumns={2}
-          contentContainerStyle={styles.listContainer}
-          showsVerticalScrollIndicator={true}
-          alwaysBounceVertical={true}
-        />
-      </SafeAreaView>
-      <FilterOptions visible={isVisible} onClose={() => setIsVisible(false)}>
-        <View
-          style={{
-            flexDirection: 'row',
-            justifyContent: 'center',
-            paddingVertical: 10,
-            borderBottomWidth: 1,
-            borderColor: Colors.gray_100,
-          }}
-        >
-          <View
-            style={{
-              flexDirection: 'row',
-              marginHorizontal: 80,
-              paddingStart: 60,
-            }}
-          >
-            <PoppinsText style={{ color: Colors.primary, paddingEnd: 5 }}>
-              Filtros
-            </PoppinsText>
-            <AdjustmentsHorizontalIcon
-              size={20}
-              color={Colors.iconMainDefault}
-            />
-          </View>
-          <TouchableOpacity onPress={clearFilters}>
-            <PoppinsText>Limpiar</PoppinsText>
-          </TouchableOpacity>
-        </View>
-        <ScrollView>
-          <View style={{ paddingVertical: 10 }}>
+      <FlatList
+        data={search}
+        renderItem={renderItem}
+        keyExtractor={(item) => item.id.toString()}
+        numColumns={2}
+        contentContainerStyle={{ paddingHorizontal: 20, paddingBottom: 20 }}
+        showsVerticalScrollIndicator={true}
+        alwaysBounceVertical={true}
+      />
+      <FilterOptions
+        visible={isVisible}
+        onClose={() => setIsVisible(false)}
+        onClearFilters={clearFilters}
+        onApplyFilters={submitFilters}
+      >
+        {/* Filtros */}
+        <View style={{ paddingVertical: 10 }}>
+          <View>
+            <PoppinsText style={styles.text}>Categoría</PoppinsText>
             <View>
-              <PoppinsText weight="medium">Categoría</PoppinsText>
-              <View>
-                {categories?.map((b, index) => (
-                  <Checkbox
-                    key={index}
-                    checked={selectedCategories.includes(b.id)}
-                    label={b.name}
-                    value={b.id}
-                    onChange={(e, val) => handleCategoryToggle(e, val)}
-                    style={{ margin: 3 }}
-                    size={20}
-                  />
-                ))}
-              </View>
-            </View>
-            <View style={{ marginTop: 20 }}>
-              <PoppinsText weight="medium">Marca o Laboratorio</PoppinsText>
-              <View>
-                {brands?.map((b, index) => (
-                  <Checkbox
-                    key={index}
-                    checked={selectedBrands.includes(b.id)}
-                    label={b.name}
-                    value={b.id}
-                    onChange={(e, val) => handleBrandToggle(e, val)}
-                    style={{ margin: 3 }}
-                    size={20}
-                  />
-                ))}
-              </View>
+              {categories?.map((b, index) => (
+                <Checkbox
+                  key={index}
+                  checked={selectedCategories.includes(b.id)}
+                  label={b.name}
+                  value={b.id}
+                  onChange={(e, val) => handleCategoryToggle(e, val)}
+                  style={{ margin: 3 }}
+                  size={20}
+                />
+              ))}
             </View>
-            <View style={{ marginTop: 20 }}>
-              <PoppinsText weight="medium">Presentación</PoppinsText>
-              <View>
-                {presentations?.map((b, index) => (
-                  <Checkbox
-                    key={index}
-                    checked={selectedPresentations.includes(b.id)}
-                    label={b.name + ' ' + b.quantity + ' ' + b.measurementUnit}
-                    value={b.id}
-                    onChange={(e, val) => handlePresentationToggle(e, val)}
-                    style={{ margin: 3 }}
-                    size={20}
-                  />
-                ))}
-              </View>
+          </View>
+          <View style={{ marginTop: 20 }}>
+            <PoppinsText style={styles.text}>Marca o Laboratorio</PoppinsText>
+            <View>
+              {brands?.map((b, index) => (
+                <Checkbox
+                  key={index}
+                  checked={selectedBrands.includes(b.id)}
+                  label={b.name}
+                  value={b.id}
+                  onChange={(e, val) => handleBrandToggle(e, val)}
+                  style={{ margin: 3 }}
+                  size={20}
+                />
+              ))}
             </View>
           </View>
           <View style={{ marginTop: 20 }}>
-            <PoppinsText weight="medium">Precio</PoppinsText>
-            <Steps
-              totalSteps={2}
-              currentStep={2}
-              labels={['Bs. 40.00', 'Bs. 1000.00']}
-            />
-            <Button title="Filtrar" onPress={submitFilters} />
+            <PoppinsText style={styles.text}>Presentación</PoppinsText>
+            <View>
+              {presentations?.map((b, index) => (
+                <Checkbox
+                  key={index}
+                  checked={selectedPresentations.includes(b.id)}
+                  label={b.name + ' ' + b.quantity + ' ' + b.measurementUnit}
+                  value={b.id}
+                  onChange={(e, val) => handlePresentationToggle(e, val)}
+                  style={{ margin: 3 }}
+                  size={20}
+                />
+              ))}
+            </View>
           </View>
-        </ScrollView>
+        </View>
       </FilterOptions>
-    </View>
+    </SafeAreaView>
   );
 }
 
@@ -276,6 +278,11 @@ const styles = StyleSheet.create({
     justifyContent: 'center',
     marginVertical: 8,
   },
+  text: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    marginBottom: 8,
+  },
   imageIndicator: {
     width: 8,
     height: 8,
diff --git a/src/screens/SplashScreen.tsx b/src/screens/SplashScreen.tsx
index 6c3d1e2..2257c3f 100644
--- a/src/screens/SplashScreen.tsx
+++ b/src/screens/SplashScreen.tsx
@@ -27,7 +27,7 @@ export default function SplashScreen() {
             }
           } else {
             console.error(
-              'Error al obtener el perfil del usuario:',
+              'Error al obtener el perfil del usuario (se lleva al login):',
               profileResponse.error,
             );
             router.replace('/login'); // Redirigir al login en caso de error
diff --git a/src/services/user.ts b/src/services/user.ts
index a1a0a65..b719bf9 100644
--- a/src/services/user.ts
+++ b/src/services/user.ts
@@ -34,7 +34,7 @@ export const UserService = {
       console.log('Profile Data:', response); // Verificar los datos del perfil
       return { success: true, data: response };
     } catch (error) {
-      console.error('Error fetching profile:', error);
+      console.error('Error fetching profile (se lleva al login):', error);
       return {
         success: false,
         error: extractErrorMessage(error),

From 3d6bf66ea98a65a5564dd96cb215f85825ab720b Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 17:07:55 -0400
Subject: [PATCH 181/291] Add notification icons and improve message
 translation in NotificationsScreen

---
 declarations.d.ts                   |   5 ++
 src/screens/NotificationsScreen.tsx | 115 ++++++++++++++++++++++++----
 2 files changed, 107 insertions(+), 13 deletions(-)

diff --git a/declarations.d.ts b/declarations.d.ts
index 894d908..933d520 100644
--- a/declarations.d.ts
+++ b/declarations.d.ts
@@ -2,3 +2,8 @@ declare module '*.png' {
   const value: number;
   export default value;
 }
+
+declare module '*.jpg' {
+  const value: string;
+  export default value;
+}
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index c012770..33a79b0 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -5,7 +5,7 @@ import {
   ScrollView,
   Image,
   ActivityIndicator,
-  TouchableOpacity,
+  ImageSourcePropType,
 } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import {
@@ -25,6 +25,24 @@ import { Colors, FontSizes } from '../styles/theme';
 import { NotificationService } from '../services/notifications';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 
+// Importa las imágenes normalmente...
+import completedImg from '../assets/images/notifications/f.jpg';
+import inProgressImg from '../assets/images/notifications/r.jpg';
+import approvedImg from '../assets/images/notifications/image.jpg';
+import canceledImg from '../assets/images/notifications/w.jpg';
+import readyForPickupImg from '../assets/images/notifications/e.jpg';
+import deliveryImg from '../assets/images/notifications/m.jpg';
+
+// ...y luego asértalas a ImageSourcePropType
+const notificationIcons: Record<string, ImageSourcePropType> = {
+  completed: completedImg as unknown as ImageSourcePropType,
+  in_progress: inProgressImg as unknown as ImageSourcePropType,
+  approved: approvedImg as unknown as ImageSourcePropType,
+  canceled: canceledImg as unknown as ImageSourcePropType,
+  ready_for_pickup: readyForPickupImg as unknown as ImageSourcePropType,
+  delivery: deliveryImg as unknown as ImageSourcePropType,
+};
+
 export default function NotificationsScreen() {
   const navigation = useNavigation();
 
@@ -34,6 +52,7 @@ export default function NotificationsScreen() {
       title: string;
       message: string;
       createdAt: string;
+      isRead: boolean;
     }>
   >([]);
   const [loading, setLoading] = useState(true);
@@ -56,6 +75,7 @@ export default function NotificationsScreen() {
               title: nt.title,
               message: nt.message,
               createdAt: nt.createdAt,
+              isRead: !!nt.isRead,
             })),
           );
         } else {
@@ -85,6 +105,58 @@ export default function NotificationsScreen() {
     return format(date, 'yyyy-MM-dd', { locale: es });
   };
 
+  const getNotificationIcon = (message: string): ImageSourcePropType => {
+    for (const key in notificationIcons) {
+      if (message.includes(key)) {
+        return notificationIcons[key];
+      }
+    }
+    return NotificationIcon;
+  };
+
+  const extractStatusKey = (message: string): string | null => {
+    const regex = /The order (\S+) has been updated to ([\w_]+)\.?/i;
+    const match = message.match(regex);
+    return match ? match[2].replace(/\.?$/, '').toLowerCase() : null;
+  };
+
+  const translateMessage = (message: string) => {
+    const regex = /The order (\S+) has been updated to ([\w_]+)\.?/i;
+    const match = message.match(regex);
+    if (match) {
+      const [, orderId, rawStatus] = match;
+      const statusKey = rawStatus
+        .replace(/\.?$/, '')
+        .replace(/_/g, ' ')
+        .toLowerCase();
+      const statusMap: Record<string, string> = {
+        completed: 'completada',
+        'in progress': 'en progreso',
+        approved: 'aprobada',
+        canceled: 'cancelada',
+        'ready for pickup': 'lista para recoger',
+        delivery: 'en entrega',
+      };
+      const statusSpanish = statusMap[statusKey] || statusKey;
+      return `La orden ${orderId} ha sido actualizada a ${statusSpanish}`;
+    }
+    return message;
+  };
+
+  const getTranslatedTitle = (nt: { title: string; message: string }) => {
+    const key = extractStatusKey(nt.message);
+    if (!key) return nt.title;
+    const titleMap: Record<string, string> = {
+      completed: 'Pedido Completado',
+      in_progress: 'Pedido en Progreso',
+      approved: 'Orden Aprobada',
+      canceled: 'Orden Cancelada',
+      ready_for_pickup: 'Pedido Listo para Recoger',
+      delivery: 'Pedido en Entrega',
+    };
+    return titleMap[key] || nt.title;
+  };
+
   return (
     <View style={styles.container}>
       <TopBar />
@@ -119,24 +191,28 @@ export default function NotificationsScreen() {
       ) : (
         <ScrollView contentContainerStyle={styles.listContainer}>
           {notificationsList.map((nt) => (
-            <TouchableOpacity
+            <View
               key={nt.id}
-              style={styles.item}
-              onPress={() => {
-                /* TODO: navegar a detalle o marcar como leído */
-              }}
+              style={[styles.item, !nt.isRead && styles.unreadBackground]}
             >
-              <Image source={NotificationIcon} style={styles.icon} />
+              <Image
+                source={getNotificationIcon(nt.message)}
+                style={styles.icon}
+              />
               <View style={styles.textContainer}>
                 <View style={styles.itemHeader}>
-                  <PoppinsText weight="semibold">{nt.title}</PoppinsText>
+                  <PoppinsText weight="semibold">
+                    {getTranslatedTitle(nt)}
+                  </PoppinsText>
                   <PoppinsText style={styles.date}>
                     {formatRelativeDate(nt.createdAt)}
                   </PoppinsText>
                 </View>
-                <PoppinsText style={styles.message}>{nt.message}</PoppinsText>
+                <PoppinsText style={styles.message}>
+                  {translateMessage(nt.message)}
+                </PoppinsText>
               </View>
-            </TouchableOpacity>
+            </View>
           ))}
         </ScrollView>
       )}
@@ -162,7 +238,7 @@ const styles = StyleSheet.create({
   },
   title: {
     fontSize: FontSizes.s1.size,
-    marginLeft: 20,
+    marginLeft: 40,
     color: Colors.textMain,
   },
   loader: { marginTop: 40 },
@@ -180,8 +256,19 @@ const styles = StyleSheet.create({
     borderBottomWidth: 1,
     borderBottomColor: Colors.bgColor,
   },
-  icon: { width: 32, height: 32, marginRight: 12, marginTop: 4 },
-  textContainer: { flex: 1 },
+  unreadBackground: {
+    backgroundColor: '#FFFFFF',
+  },
+  icon: {
+    width: 32,
+    height: 32,
+    marginRight: 12,
+    marginTop: 4,
+    borderRadius: 16,
+  },
+  textContainer: {
+    flex: 1,
+  },
   itemHeader: {
     flexDirection: 'row',
     justifyContent: 'space-between',
@@ -194,5 +281,7 @@ const styles = StyleSheet.create({
   message: {
     color: Colors.textLowContrast,
     fontSize: FontSizes.c1.size,
+    marginRight: 80,
+    flexWrap: 'wrap',
   },
 });

From 78ad82b3b8e50cc4e450d3844bac5b2ee4c834ce Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 18:00:05 -0400
Subject: [PATCH 182/291] Add notifications context and service for managing
 app notifications

---
 src/app/_layout.tsx           | 229 ++++++++++++++++++----------------
 src/components/TopBar.tsx     |  11 +-
 src/hooks/useNotifications.ts |  76 +++++++++++
 src/services/notifications.ts |   7 ++
 4 files changed, 209 insertions(+), 114 deletions(-)
 create mode 100644 src/hooks/useNotifications.ts

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 21b4c8c..a740c13 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -17,6 +17,7 @@ import { ChevronLeftIcon, XMarkIcon } from 'react-native-heroicons/outline';
 import { Provider } from 'react-redux';
 import { store } from '../redux/store';
 import { Colors } from '../styles/theme';
+import { NotificationsProvider } from '../hooks/useNotifications';
 
 SplashScreen.preventAutoHideAsync();
 
@@ -49,117 +50,125 @@ export default function RootLayout() {
   }
 
   return (
-    <Provider store={store}>
-      <Stack
-        screenOptions={({ navigation }) => ({
-          headerBackVisible: false,
-          headerLeft: () =>
-            navigation.canGoBack() ? (
-              <TouchableOpacity onPress={navigation.goBack}>
-                <ChevronLeftIcon width={24} height={24} color="#000" />
-              </TouchableOpacity>
-            ) : null,
-          headerBackTitleVisible: false,
-        })}
-      >
-        {/* Cambia la pantalla inicial al SplashScreen personalizado */}
-        <Stack.Screen name="index" options={{ headerShown: false }} />
-
-        <Stack.Screen name="login" options={{ headerShown: false }} />
-        <Stack.Screen name="splash" options={{ headerShown: false }} />
-        <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="products" options={{ headerShown: false }} />
-        <Stack.Screen name="search" options={{ headerShown: false }} />
-        <Stack.Screen
-          name="profile"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="notifications"
-          options={{
-            headerShown: false,
-            headerTransparent: false,
-            headerTitle: '',
-          }}
-        />
-        <Stack.Screen
-          name="menu"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="direction"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="selectLocation"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="createDirection"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="orders"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="order"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="change-direction"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="register"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="passwordRecovery"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="loggedInPasswordRecovery"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="success"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen
-          name="cart"
-          options={({ navigation }) => ({
-            headerTitle: '',
-            headerTransparent: true,
-            headerLeft: undefined,
-            headerRight: () => (
-              <TouchableOpacity onPress={() => navigation.goBack()}>
-                <XMarkIcon width={24} height={24} color="#000" />
-              </TouchableOpacity>
-            ),
+    <NotificationsProvider>
+      <Provider store={store}>
+        <Stack
+          screenOptions={({ navigation }) => ({
+            headerBackVisible: false,
+            headerLeft: () =>
+              navigation.canGoBack() ? (
+                <TouchableOpacity onPress={navigation.goBack}>
+                  <ChevronLeftIcon width={24} height={24} color="#000" />
+                </TouchableOpacity>
+              ) : null,
+            headerBackTitleVisible: false,
           })}
-        />
-        <Stack.Screen
-          name="change-password"
-          options={{ headerTitle: '', headerTransparent: true }}
-        />
-        <Stack.Screen name="(delivery-tabs)" options={{ headerShown: false }} />
-        <Stack.Screen name="deliveryDetail" options={{ headerShown: false }} />
-        <Stack.Screen
-          name="deliveryHistoryDetail"
-          options={{ headerShown: false }}
-        />
-        <Stack.Screen
-          name="checkout"
-          options={{
-            headerTitle: '',
-            headerTransparent: true,
-            headerLeft: undefined,
-            headerShown: false,
-          }}
-        />
-      </Stack>
-    </Provider>
+        >
+          {/* Cambia la pantalla inicial al SplashScreen personalizado */}
+          <Stack.Screen name="index" options={{ headerShown: false }} />
+
+          <Stack.Screen name="login" options={{ headerShown: false }} />
+          <Stack.Screen name="splash" options={{ headerShown: false }} />
+          <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
+          <Stack.Screen name="products" options={{ headerShown: false }} />
+          <Stack.Screen name="search" options={{ headerShown: false }} />
+          <Stack.Screen
+            name="profile"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="notifications"
+            options={{
+              headerShown: false,
+              headerTransparent: false,
+              headerTitle: '',
+            }}
+          />
+          <Stack.Screen
+            name="menu"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="direction"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="selectLocation"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="createDirection"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="orders"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="order"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="change-direction"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="register"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="passwordRecovery"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="loggedInPasswordRecovery"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="success"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="cart"
+            options={({ navigation }) => ({
+              headerTitle: '',
+              headerTransparent: true,
+              headerLeft: undefined,
+              headerRight: () => (
+                <TouchableOpacity onPress={() => navigation.goBack()}>
+                  <XMarkIcon width={24} height={24} color="#000" />
+                </TouchableOpacity>
+              ),
+            })}
+          />
+          <Stack.Screen
+            name="change-password"
+            options={{ headerTitle: '', headerTransparent: true }}
+          />
+          <Stack.Screen
+            name="(delivery-tabs)"
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name="deliveryDetail"
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name="deliveryHistoryDetail"
+            options={{ headerShown: false }}
+          />
+          <Stack.Screen
+            name="checkout"
+            options={{
+              headerTitle: '',
+              headerTransparent: true,
+              headerLeft: undefined,
+              headerShown: false,
+            }}
+          />
+        </Stack>
+      </Provider>
+    </NotificationsProvider>
   );
 }
 
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index c945f76..789b5fc 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -10,6 +10,7 @@ import { AuthService } from '../services/auth';
 import Badge from './Badge';
 import { useCart } from '../hooks/useCart';
 import AvatarWithMenu from './AvatarWithMenu';
+import { useNotifications } from '../hooks/useNotifications';
 
 const TopBar = () => {
   const [searchText, setSearchText] = useState('');
@@ -18,6 +19,8 @@ const TopBar = () => {
     useState(false);
   const router = useRouter();
   const { cartItems } = useCart();
+  const { notifications } = useNotifications();
+  const unreadCount = notifications.filter((n) => !n.isRead).length;
 
   // Calculate the total quantity of items in the cart
   const totalCartQuantity = cartItems.reduce(
@@ -66,10 +69,10 @@ const TopBar = () => {
           }}
         >
           <BellIcon size={26} color={Colors.textMain} />
-          {totalCartQuantity > 0 && (
+          {unreadCount > 0 && (
             <View style={styles.badgeContainer}>
-              <Badge variant="filled" color="primary" size="tiny">
-                {totalCartQuantity}
+              <Badge variant="filled" color="danger" size="tiny">
+                {unreadCount}
               </Badge>
             </View>
           )}
@@ -164,7 +167,7 @@ const styles = StyleSheet.create({
     marginLeft: 55,
   },
   iconButton: {
-    paddingRight: 4,
+    paddingRight: 5,
     position: 'relative',
   },
   badgeContainer: {
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
new file mode 100644
index 0000000..fb5f73d
--- /dev/null
+++ b/src/hooks/useNotifications.ts
@@ -0,0 +1,76 @@
+import React, {
+  createContext,
+  useContext,
+  useEffect,
+  useState,
+  ReactNode,
+} from 'react';
+import { NotificationService } from '../services/notifications';
+import { NotificationResponse } from '@pharmatech/sdk';
+import { ServiceResponse } from '../types/api';
+
+// Define tu tipo interno
+export type Notification = NotificationResponse & { isRead: boolean };
+
+type NotificationsContextType = {
+  notifications: Notification[];
+  markAsRead: (id: string) => void;
+  refreshNotifications: () => Promise<void>;
+};
+
+const NotificationsContext = createContext<NotificationsContextType | null>(
+  null,
+);
+
+export function NotificationsProvider(props: { children: ReactNode }) {
+  const [notifications, setNotifications] = useState<Notification[]>([]);
+
+  const refreshNotifications = async () => {
+    // Llamas al service
+    const response: ServiceResponse<
+      NotificationResponse | NotificationResponse[]
+    > = await NotificationService.getNotifications();
+
+    if (response.success && response.data) {
+      // response.data puede ser un array o un solo objeto
+      const raw = Array.isArray(response.data)
+        ? response.data
+        : [response.data];
+
+      const withReadFlag: Notification[] = raw.map((n) => ({
+        ...n,
+        isRead: false,
+      }));
+      setNotifications(withReadFlag);
+    } else {
+      // Solo logueamos whole response para debug
+      console.error('Error cargando notificaciones:', response);
+    }
+  };
+
+  useEffect(() => {
+    refreshNotifications();
+  }, []);
+
+  const markAsRead = (id: string) => {
+    setNotifications((prev) =>
+      prev.map((n) => (n.id === id ? { ...n, isRead: true } : n)),
+    );
+  };
+
+  return React.createElement(
+    NotificationsContext.Provider,
+    { value: { notifications, markAsRead, refreshNotifications } },
+    props.children,
+  );
+}
+
+export function useNotifications(): NotificationsContextType {
+  const ctx = useContext(NotificationsContext);
+  if (!ctx) {
+    throw new Error(
+      'useNotifications debe usarse dentro de NotificationsProvider',
+    );
+  }
+  return ctx;
+}
diff --git a/src/services/notifications.ts b/src/services/notifications.ts
index 7f58a04..ec305fc 100644
--- a/src/services/notifications.ts
+++ b/src/services/notifications.ts
@@ -24,4 +24,11 @@ export const NotificationService = {
       };
     }
   },
+  markAsRead: async (orderId: string, jwt: string): Promise<void> => {
+    try {
+      await api.notification.markAsRead(orderId, jwt);
+    } catch (error) {
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };

From 277d78558d2fbe6609ec272046a6b7c83a148c3c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 30 Apr 2025 18:10:29 -0400
Subject: [PATCH 183/291] Finishing search filters

---
 src/components/FilterOptions.tsx    |  7 ++-
 src/components/SearchInput.tsx      |  2 +-
 src/screens/SearchProductScreen.tsx | 97 ++++++++++++++++++-----------
 3 files changed, 66 insertions(+), 40 deletions(-)

diff --git a/src/components/FilterOptions.tsx b/src/components/FilterOptions.tsx
index a3752c6..05136e1 100644
--- a/src/components/FilterOptions.tsx
+++ b/src/components/FilterOptions.tsx
@@ -86,6 +86,11 @@ const FilterOptions: React.FC<FilterOptionsProps> = ({
     closeSheet();
   };
 
+  const handleClearFilters = () => {
+    setPriceRange({ min: 0, max: 1000 }); // Reiniciar el rango de precios
+    onClearFilters(); // Llamar a la función pasada como prop
+  };
+
   return (
     <Modal
       animated
@@ -112,7 +117,7 @@ const FilterOptions: React.FC<FilterOptionsProps> = ({
                   color={Colors.iconMainDefault}
                 />
               </View>
-              <TouchableWithoutFeedback onPress={onClearFilters}>
+              <TouchableWithoutFeedback onPress={handleClearFilters}>
                 <View style={styles.clearButtonContainer}>
                   <PoppinsText style={styles.clearText}>Limpiar</PoppinsText>
                 </View>
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index 6d6418e..63ffa96 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -195,7 +195,7 @@ const SearchInput: React.FC<SearchInputProps> = ({
                         color: Colors.primary,
                       }}
                     >
-                      Bs. {p?.price}
+                      $ {p?.price}
                     </PoppinsText>
                   </View>
                 </TouchableOpacity>
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 714125a..0007391 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -30,11 +30,16 @@ import { useNavigation } from '@react-navigation/native';
 export default function SearchProductScreen() {
   const { query } = useLocalSearchParams<{ query: string }>();
 
-  const [search, setSearch] = useState<ProductPresentation[]>();
+  const [initialSearchResults, setInitialSearchResults] = useState<
+    ProductPresentation[]
+  >([]); // Almacena los resultados iniciales
+  const [search, setSearch] = useState<ProductPresentation[]>([]); // Almacena los resultados actuales (filtrados)
   const [isVisible, setIsVisible] = useState(false);
-  const [brands, setBrands] = useState<ManufacturerResponse[]>();
-  const [categories, setCategories] = useState<CategoryResponse[]>();
-  const [presentations, setPresentations] = useState<PresentationResponse[]>();
+  const [brands, setBrands] = useState<ManufacturerResponse[]>([]); // Cambiado a ManufacturerResponse
+  const [categories, setCategories] = useState<CategoryResponse[]>([]); // Cambiado a CategoryResponse
+  const [presentations, setPresentations] = useState<PresentationResponse[]>(
+    [],
+  );
   const navigation = useNavigation();
 
   const [selectedPresentations, setSelectedPresentations] = useState<string[]>(
@@ -42,11 +47,11 @@ export default function SearchProductScreen() {
   );
   const [selectedCategories, setSelectedCategories] = useState<string[]>([]);
   const [selectedBrands, setSelectedBrands] = useState<string[]>([]);
+  const priceRange = useState({ min: 0, max: 1000 });
 
   const handleBrandToggle = (brand: boolean, value: string) => {
     if (brand) {
       setSelectedBrands([...selectedBrands, value]);
-      return [...selectedBrands, value];
     } else {
       setSelectedBrands((prev) => prev.filter((item) => item !== value));
     }
@@ -55,7 +60,6 @@ export default function SearchProductScreen() {
   const handleCategoryToggle = (category: boolean, value: string) => {
     if (category) {
       setSelectedCategories([...selectedCategories, value]);
-      return [...selectedCategories, value];
     } else {
       setSelectedCategories((prev) => prev.filter((item) => item !== value));
     }
@@ -64,7 +68,6 @@ export default function SearchProductScreen() {
   const handlePresentationToggle = (presentation: boolean, value: string) => {
     if (presentation) {
       setSelectedPresentations([...selectedPresentations, value]);
-      return [...selectedPresentations, value];
     } else {
       setSelectedPresentations((prev) => prev.filter((item) => item !== value));
     }
@@ -74,37 +77,52 @@ export default function SearchProductScreen() {
     setSelectedBrands([]);
     setSelectedCategories([]);
     setSelectedPresentations([]);
+    setSearch(initialSearchResults); // Restablecer los resultados a los iniciales
   };
 
-  const submitFilters = async () => {
-    try {
-      const searchData = await ProductService.getProducts(1, 20, {
-        q: query,
-        manufacturerId: selectedBrands,
-        categoryId: selectedCategories,
-        presentationId: selectedPresentations,
-      });
+  const submitFilters = (range: { min: number; max: number }) => {
+    const filteredResults = initialSearchResults.filter((item) => {
+      const matchesBrand =
+        selectedBrands.length === 0 ||
+        selectedBrands.includes(
+          (item.product.manufacturer as ManufacturerResponse).id,
+        );
 
-      if (searchData.success) {
-        // Combinar los resultados actuales con los nuevos resultados
-        setSearch((prev) => [...(prev || []), ...searchData.data.results]);
-      }
-    } catch (error) {
-      console.error('Error al aplicar filtros:', error);
-    }
+      const matchesCategory =
+        selectedCategories.length === 0 ||
+        (item.product.categories as CategoryResponse[]).some((category) =>
+          selectedCategories.includes(category.id),
+        );
+
+      const matchesPresentation =
+        selectedPresentations.length === 0 ||
+        selectedPresentations.includes(item.presentation.id);
+
+      const matchesPrice = item.price >= range.min && item.price <= range.max; // Usar el rango pasado como argumento
+
+      return (
+        matchesBrand && matchesCategory && matchesPresentation && matchesPrice
+      );
+    });
+
+    setSearch(filteredResults);
   };
 
   useEffect(() => {
     const fetchSearchData = async () => {
       const searchData = await ProductService.getProducts(1, 20, { q: query });
-      const brands = await ProductService.getBrands(1, 100);
-      const presentations = await ProductService.getPresentations(1, 100);
-      const categories = await CategoryService.getCategories(1, 100);
+      const brandsData = await ProductService.getBrands(1, 100);
+      const presentationsData = await ProductService.getPresentations(1, 100);
+      const categoriesData = await CategoryService.getCategories(1, 100);
 
-      if (searchData.success) setSearch(searchData.data.results);
-      if (brands.success) setBrands(brands.data.results);
-      if (presentations.success) setPresentations(presentations.data.results);
-      if (categories.success) setCategories(categories.data.results);
+      if (searchData.success) {
+        setInitialSearchResults(searchData.data.results); // Guardar los resultados iniciales
+        setSearch(searchData.data.results); // Mostrar los resultados iniciales
+      }
+      if (brandsData.success) setBrands(brandsData.data.results);
+      if (presentationsData.success)
+        setPresentations(presentationsData.data.results);
+      if (categoriesData.success) setCategories(categoriesData.data.results);
     };
 
     fetchSearchData();
@@ -124,8 +142,8 @@ export default function SearchProductScreen() {
         ' ' +
         item.presentation.measurementUnit
       }
-      category={item.product.categories[0].name}
-      imageUrl={item.product.images[0].url}
+      category={item.product.categories[0]?.name}
+      imageUrl={item.product.images[0]?.url}
       originalPrice={item.price}
       discount={10}
       finalPrice={item.price * 0.1}
@@ -199,16 +217,19 @@ export default function SearchProductScreen() {
         visible={isVisible}
         onClose={() => setIsVisible(false)}
         onClearFilters={clearFilters}
-        onApplyFilters={submitFilters}
+        onApplyFilters={(range) => {
+          priceRange[1](range); // Actualizar el rango de precios
+          submitFilters(range); // Aplicar los filtros
+        }}
       >
         {/* Filtros */}
         <View style={{ paddingVertical: 10 }}>
           <View>
             <PoppinsText style={styles.text}>Categoría</PoppinsText>
             <View>
-              {categories?.map((b, index) => (
+              {categories?.map((b) => (
                 <Checkbox
-                  key={index}
+                  key={b.id}
                   checked={selectedCategories.includes(b.id)}
                   label={b.name}
                   value={b.id}
@@ -222,9 +243,9 @@ export default function SearchProductScreen() {
           <View style={{ marginTop: 20 }}>
             <PoppinsText style={styles.text}>Marca o Laboratorio</PoppinsText>
             <View>
-              {brands?.map((b, index) => (
+              {brands?.map((b) => (
                 <Checkbox
-                  key={index}
+                  key={b.id}
                   checked={selectedBrands.includes(b.id)}
                   label={b.name}
                   value={b.id}
@@ -238,9 +259,9 @@ export default function SearchProductScreen() {
           <View style={{ marginTop: 20 }}>
             <PoppinsText style={styles.text}>Presentación</PoppinsText>
             <View>
-              {presentations?.map((b, index) => (
+              {presentations?.map((b) => (
                 <Checkbox
-                  key={index}
+                  key={b.id}
                   checked={selectedPresentations.includes(b.id)}
                   label={b.name + ' ' + b.quantity + ' ' + b.measurementUnit}
                   value={b.id}

From 813d13ef4b042470cc64dfe5a78dde94687e4200 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 30 Apr 2025 18:48:44 -0400
Subject: [PATCH 184/291] Adapting project to latest sdk release with the
 elimination of zip code

---
 package-lock.json                     |  8 ++++----
 package.json                          |  2 +-
 src/screens/DirectionChangeScreen.tsx | 11 -----------
 src/screens/DirectionCreateScreen.tsx | 12 +-----------
 src/screens/DirectionScreen.tsx       |  1 -
 src/types/api.d.ts                    |  2 --
 6 files changed, 6 insertions(+), 30 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 103bcc6..dbd08d0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.9",
+        "@pharmatech/sdk": "^0.4.11",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -4025,9 +4025,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.9",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.9.tgz",
-      "integrity": "sha512-E0UKWSs1R8CEXCxHSqmVFvlNcYg8xcPJrTQVDAUnrMeAIBBVBck4gg9ymXYIAVlbMzhpxoSVBQB5zWreFzNoUw==",
+      "version": "0.4.11",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
+      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 644e82e..fb61345 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.9",
+    "@pharmatech/sdk": "^0.4.11",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 2fb1c96..323db8f 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -86,7 +86,6 @@ const ChangeDirectionScreen = () => {
     try {
       const updatedAddress: CreateUserAddressRequest = {
         adress: address.adress,
-        zipCode: address.zipCode,
         cityId: selectedCity,
         additionalInformation: address.additionalInformation,
         referencePoint: address.referencePoint,
@@ -202,16 +201,6 @@ const ChangeDirectionScreen = () => {
           errorText="El campo no puede estar vacío"
           backgroundColor={isEditable ? Colors.textWhite : undefined}
         />
-        <Input
-          label="Código Postal:"
-          value={address?.zipCode}
-          isEditable={isEditable}
-          border={isEditable ? 'default' : 'none'}
-          getValue={(value) => setAddress({ ...address, zipCode: value })}
-          fieldType="number"
-          errorText="El campo no puede estar vacío"
-          backgroundColor={isEditable ? Colors.textWhite : undefined}
-        />
         <Input
           label="Información adicional:"
           value={
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index f932cc8..f91ce3a 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -23,7 +23,6 @@ const DirectionCreateScreen = () => {
 
   const [address, setAddress] = useState<CreateUserAddressRequest>({
     adress: '',
-    zipCode: '',
     additionalInformation: '',
     referencePoint: '',
     latitude: latitude ? parseFloat(latitude as string) : null,
@@ -64,7 +63,7 @@ const DirectionCreateScreen = () => {
   }, [selectedState]);
 
   const submitAddress = async () => {
-    if (!validateRequiredFields([address.adress, address.zipCode])) {
+    if (!validateRequiredFields([address.adress])) {
       setShowErrorAlert(true);
       setErrorMessage('Por favor completa todos los campos obligatorios');
       return;
@@ -84,7 +83,6 @@ const DirectionCreateScreen = () => {
     try {
       const newAddress: CreateUserAddressRequest = {
         adress: address.adress,
-        zipCode: address.zipCode,
         latitude: address.latitude,
         longitude: address.longitude,
         cityId: selectedCity,
@@ -176,14 +174,6 @@ const DirectionCreateScreen = () => {
           errorText="El campo no puede estar vacío"
           backgroundColor={Colors.textWhite}
         />
-        <Input
-          label="Código Postal:"
-          value={address?.zipCode}
-          getValue={(value) => setAddress({ ...address, zipCode: value })}
-          fieldType="number"
-          errorText="El campo no puede estar vacío"
-          backgroundColor={Colors.textWhite}
-        />
         <Input
           label="Información adicional:"
           value={address?.additionalInformation ?? undefined}
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index 2302903..8653b6b 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -121,7 +121,6 @@ const DirectionScreen = () => {
                 </PoppinsText>
                 <PoppinsText style={styles.cityText} weight="regular">
                   {direction.nameCity}, {direction.nameState},{' '}
-                  {direction.zipCode}
                 </PoppinsText>
                 {direction.additionalInformation && (
                   <PoppinsText
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index f351b4e..1cfae9b 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -92,7 +92,6 @@ type UpdateUser = {
 
 type UserAddressResponse = {
   adress: string;
-  zipCode: string;
   latitude: number | null;
   longitude: number | null;
   cityId: string;
@@ -106,7 +105,6 @@ type UserAddressResponse = {
 
 type CreateUserAddressRequest = BaseModel & {
   adress: string;
-  zipCode?: string;
   latitude?: number | null;
   longitude?: number | null;
   cityId?: string;

From fe84d860b00714317acdad9b4603b7c55bbd4b97 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 19:35:07 -0400
Subject: [PATCH 185/291] Refactor Notifications handling and improve TopBar
 layout

---
 src/components/TopBar.tsx           |   2 +-
 src/hooks/useNotifications.ts       |  98 +++++++++-----
 src/screens/NotificationsScreen.tsx | 195 ++++++++++++++++++----------
 3 files changed, 193 insertions(+), 102 deletions(-)

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index 789b5fc..e9cc640 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -63,7 +63,7 @@ const TopBar = () => {
         </View>
 
         <TouchableOpacity
-          style={{ paddingRight: 10 }}
+          style={{ paddingRight: 5 }}
           onPress={() => {
             router.push('/notifications');
           }}
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index fb5f73d..49a9ad5 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -1,20 +1,24 @@
+// src/context/NotificationsContext.ts
+
 import React, {
   createContext,
   useContext,
   useEffect,
   useState,
   ReactNode,
+  useCallback,
 } from 'react';
 import { NotificationService } from '../services/notifications';
 import { NotificationResponse } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
+import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 
-// Define tu tipo interno
 export type Notification = NotificationResponse & { isRead: boolean };
 
-type NotificationsContextType = {
+export type NotificationsContextType = {
   notifications: Notification[];
-  markAsRead: (id: string) => void;
+  markAsRead: (notificationId: string) => Promise<void>;
+  markAsUnread: (notificationId: string) => Promise<void>;
   refreshNotifications: () => Promise<void>;
 };
 
@@ -25,42 +29,78 @@ const NotificationsContext = createContext<NotificationsContextType | null>(
 export function NotificationsProvider(props: { children: ReactNode }) {
   const [notifications, setNotifications] = useState<Notification[]>([]);
 
-  const refreshNotifications = async () => {
-    // Llamas al service
-    const response: ServiceResponse<
-      NotificationResponse | NotificationResponse[]
-    > = await NotificationService.getNotifications();
+  const refreshNotifications = useCallback(async (): Promise<void> => {
+    try {
+      const token = await getUserIdFromSecureStore();
+      if (!token)
+        throw new Error('No se pudo obtener el token de autenticación.');
+
+      const response: ServiceResponse<
+        NotificationResponse | NotificationResponse[]
+      > = await NotificationService.getNotifications();
 
-    if (response.success && response.data) {
-      // response.data puede ser un array o un solo objeto
-      const raw = Array.isArray(response.data)
-        ? response.data
-        : [response.data];
+      if (response.success && response.data) {
+        const rawArray = Array.isArray(response.data)
+          ? response.data
+          : [response.data];
 
-      const withReadFlag: Notification[] = raw.map((n) => ({
-        ...n,
-        isRead: false,
-      }));
-      setNotifications(withReadFlag);
-    } else {
-      // Solo logueamos whole response para debug
-      console.error('Error cargando notificaciones:', response);
+        setNotifications(
+          rawArray.map((n: NotificationResponse) => ({
+            ...n,
+            isRead: Boolean(n.isRead), // Explicitly use the type from NotificationResponse
+          })),
+        );
+      } else {
+        console.error('Error cargando notificaciones:', response);
+      }
+    } catch (err) {
+      console.error('Excepción cargando notificaciones:', err);
     }
-  };
+  }, []);
 
   useEffect(() => {
-    refreshNotifications();
+    void refreshNotifications();
+  }, [refreshNotifications]);
+
+  const markAsRead = useCallback(async (notificationId: string) => {
+    try {
+      const token = await getUserIdFromSecureStore();
+      if (!token)
+        throw new Error('No se pudo obtener el token de autenticación.');
+
+      await NotificationService.markAsRead(notificationId, token);
+      setNotifications((prev) =>
+        prev.map((n) => (n.id === notificationId ? { ...n, isRead: true } : n)),
+      );
+    } catch (err) {
+      console.error(
+        `Error marcando notificación ${notificationId} como leída:`,
+        err,
+      );
+    }
   }, []);
 
-  const markAsRead = (id: string) => {
-    setNotifications((prev) =>
-      prev.map((n) => (n.id === id ? { ...n, isRead: true } : n)),
-    );
-  };
+  const markAsUnread = useCallback(async (notificationId: string) => {
+    try {
+      // Si la API soporta 'unread', aquí iría la llamada a NotificationService.markAsUnread(...)
+      setNotifications((prev) =>
+        prev.map((n) =>
+          n.id === notificationId ? { ...n, isRead: false } : n,
+        ),
+      );
+    } catch (err) {
+      console.error(
+        `Error marcando notificación ${notificationId} como no leída:`,
+        err,
+      );
+    }
+  }, []);
 
   return React.createElement(
     NotificationsContext.Provider,
-    { value: { notifications, markAsRead, refreshNotifications } },
+    {
+      value: { notifications, markAsRead, markAsUnread, refreshNotifications },
+    },
     props.children,
   );
 }
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 33a79b0..4fb1e12 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -1,4 +1,5 @@
-import React, { useEffect, useState } from 'react';
+// src/screens/NotificationsScreen.tsx
+import React, { useEffect, useState, useCallback } from 'react';
 import {
   View,
   StyleSheet,
@@ -6,6 +7,7 @@ import {
   Image,
   ActivityIndicator,
   ImageSourcePropType,
+  TouchableOpacity,
 } from 'react-native';
 import { useNavigation } from '@react-navigation/native';
 import {
@@ -20,12 +22,12 @@ import TopBar from '../components/TopBar';
 import Return from '../components/Return';
 import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
-import NotificationIcon from '../assets/images/favicon.png';
+// Importamos y casteamos explicitamente el ícono por defecto
+import NotificationIconAsset from '../assets/images/favicon.png';
 import { Colors, FontSizes } from '../styles/theme';
 import { NotificationService } from '../services/notifications';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 
-// Importa las imágenes normalmente...
 import completedImg from '../assets/images/notifications/f.jpg';
 import inProgressImg from '../assets/images/notifications/r.jpg';
 import approvedImg from '../assets/images/notifications/image.jpg';
@@ -33,7 +35,7 @@ import canceledImg from '../assets/images/notifications/w.jpg';
 import readyForPickupImg from '../assets/images/notifications/e.jpg';
 import deliveryImg from '../assets/images/notifications/m.jpg';
 
-// ...y luego asértalas a ImageSourcePropType
+// Mapeo de iconos por estado
 const notificationIcons: Record<string, ImageSourcePropType> = {
   completed: completedImg as unknown as ImageSourcePropType,
   in_progress: inProgressImg as unknown as ImageSourcePropType,
@@ -43,9 +45,18 @@ const notificationIcons: Record<string, ImageSourcePropType> = {
   delivery: deliveryImg as unknown as ImageSourcePropType,
 };
 
+// Ícono por defecto, casteado a ImageSourcePropType
+const NotificationIcon =
+  NotificationIconAsset as unknown as ImageSourcePropType;
+
+// Función auxiliar para extraer orderId del mensaje
+const extractOrderIdFromMessage = (message: string): string | null => {
+  const match = message.match(/The order (\S+) has been updated to/i);
+  return match ? match[1] : null;
+};
+
 export default function NotificationsScreen() {
   const navigation = useNavigation();
-
   const [notificationsList, setNotificationsList] = useState<
     Array<{
       id: string;
@@ -53,6 +64,7 @@ export default function NotificationsScreen() {
       message: string;
       createdAt: string;
       isRead: boolean;
+      orderId: string;
     }>
   >([]);
   const [loading, setLoading] = useState(true);
@@ -68,34 +80,75 @@ export default function NotificationsScreen() {
         if (!token) throw new Error('No se pudo obtener el token de usuario.');
 
         const res = await NotificationService.getNotifications();
-        if (res.success && res.data && Array.isArray(res.data)) {
+        if (res.success && Array.isArray(res.data)) {
+          console.log('Raw notifications payload:', res.data);
+
           setNotificationsList(
-            res.data.map((nt) => ({
-              id: nt.id,
-              title: nt.title,
-              message: nt.message,
-              createdAt: nt.createdAt,
-              isRead: !!nt.isRead,
-            })),
+            res.data.map((nt) => {
+              const rawOrderId =
+                nt.orderId ||
+                (nt as { order_id?: string }).order_id || // Specify type for `order_id`
+                (nt.data &&
+                  ((nt.data as { orderId?: string }).orderId || // Specify type for `data.orderId`
+                    (nt.data as { order_id?: string }).order_id)) || // Specify type for `data.order_id`
+                extractOrderIdFromMessage(nt.message) ||
+                '';
+
+              return {
+                id: nt.id,
+                title: nt.title,
+                message: nt.message,
+                createdAt: nt.createdAt,
+                isRead: !!nt.isRead,
+                orderId: rawOrderId,
+              };
+            }),
           );
-        } else {
-          throw new Error('Respuesta inesperada del servidor');
+        } else if (!res.success) {
+          throw new Error(res.error || 'Respuesta inesperada del servidor');
         }
       } catch (err: unknown) {
-        if (err instanceof Error) {
-          setErrorMessage(err.message);
-        } else {
-          setErrorMessage('Ocurrió un error desconocido.');
-        }
+        setErrorMessage(
+          err instanceof Error ? err.message : 'Error desconocido',
+        );
         setShowErrorAlert(true);
       } finally {
         setLoading(false);
       }
     };
-
     fetchNotifications();
   }, []);
 
+  const handlePressNotification = useCallback(
+    async (nt: (typeof notificationsList)[0]) => {
+      console.log(`order ID: ${nt.orderId}`, nt);
+
+      if (nt.isRead) return;
+
+      try {
+        const token = await getUserIdFromSecureStore();
+        if (!token) throw new Error('No se pudo obtener el token de usuario.');
+        if (nt.orderId) {
+          await NotificationService.markAsRead(nt.orderId, token);
+          setNotificationsList((prev) =>
+            prev.map((n) => (n.id === nt.id ? { ...n, isRead: true } : n)),
+          );
+        } else {
+          throw new Error('ID de notificación no válido.');
+        }
+      } catch (err) {
+        const msg =
+          err instanceof Error
+            ? err.message
+            : 'Error desconocido al marcar la notificación como leída.';
+        console.error(`Error marcando notificación ${nt.id}:`, msg);
+        setErrorMessage(msg);
+        setShowErrorAlert(true);
+      }
+    },
+    [],
+  );
+
   const formatRelativeDate = (dateString: string) => {
     const date = parseISO(dateString);
     const daysDiff = differenceInDays(new Date(), date);
@@ -105,48 +158,35 @@ export default function NotificationsScreen() {
     return format(date, 'yyyy-MM-dd', { locale: es });
   };
 
-  const getNotificationIcon = (message: string): ImageSourcePropType => {
-    for (const key in notificationIcons) {
-      if (message.includes(key)) {
-        return notificationIcons[key];
-      }
-    }
-    return NotificationIcon;
-  };
-
   const extractStatusKey = (message: string): string | null => {
-    const regex = /The order (\S+) has been updated to ([\w_]+)\.?/i;
-    const match = message.match(regex);
-    return match ? match[2].replace(/\.?$/, '').toLowerCase() : null;
+    const match = message.match(
+      /The order \S+ has been updated to ([\w_]+)\.?/i,
+    );
+    return match ? match[1].toLowerCase() : null;
   };
 
   const translateMessage = (message: string) => {
-    const regex = /The order (\S+) has been updated to ([\w_]+)\.?/i;
-    const match = message.match(regex);
-    if (match) {
-      const [, orderId, rawStatus] = match;
-      const statusKey = rawStatus
-        .replace(/\.?$/, '')
-        .replace(/_/g, ' ')
-        .toLowerCase();
-      const statusMap: Record<string, string> = {
-        completed: 'completada',
-        'in progress': 'en progreso',
-        approved: 'aprobada',
-        canceled: 'cancelada',
-        'ready for pickup': 'lista para recoger',
-        delivery: 'en entrega',
-      };
-      const statusSpanish = statusMap[statusKey] || statusKey;
-      return `La orden ${orderId} ha sido actualizada a ${statusSpanish}`;
-    }
-    return message;
+    const match = message.match(
+      /The order (\S+) has been updated to ([\w_]+)\.?/i,
+    );
+    if (!match) return message;
+    const [, orderId, rawStatus] = match;
+    const key = rawStatus.replace(/_/g, ' ').toLowerCase();
+    const map: Record<string, string> = {
+      completed: 'completada',
+      'in progress': 'en progreso',
+      approved: 'aprobada',
+      canceled: 'cancelada',
+      'ready for pickup': 'lista para recoger',
+      delivery: 'en entrega',
+    };
+    return `La orden ${orderId} ha sido actualizada a ${map[key] || key}`;
   };
 
   const getTranslatedTitle = (nt: { title: string; message: string }) => {
     const key = extractStatusKey(nt.message);
     if (!key) return nt.title;
-    const titleMap: Record<string, string> = {
+    const map: Record<string, string> = {
       completed: 'Pedido Completado',
       in_progress: 'Pedido en Progreso',
       approved: 'Orden Aprobada',
@@ -154,7 +194,12 @@ export default function NotificationsScreen() {
       ready_for_pickup: 'Pedido Listo para Recoger',
       delivery: 'Pedido en Entrega',
     };
-    return titleMap[key] || nt.title;
+    return map[key] || nt.title;
+  };
+
+  const getNotificationIcon = (message: string): ImageSourcePropType => {
+    const key = extractStatusKey(message);
+    return (key && notificationIcons[key]) || NotificationIcon;
   };
 
   return (
@@ -191,28 +236,33 @@ export default function NotificationsScreen() {
       ) : (
         <ScrollView contentContainerStyle={styles.listContainer}>
           {notificationsList.map((nt) => (
-            <View
+            <TouchableOpacity
               key={nt.id}
-              style={[styles.item, !nt.isRead && styles.unreadBackground]}
+              onPress={() => handlePressNotification(nt)}
+              activeOpacity={0.7}
             >
-              <Image
-                source={getNotificationIcon(nt.message)}
-                style={styles.icon}
-              />
-              <View style={styles.textContainer}>
-                <View style={styles.itemHeader}>
-                  <PoppinsText weight="semibold">
-                    {getTranslatedTitle(nt)}
-                  </PoppinsText>
-                  <PoppinsText style={styles.date}>
-                    {formatRelativeDate(nt.createdAt)}
+              <View
+                style={[styles.item, !nt.isRead && styles.unreadBackground]}
+              >
+                <Image
+                  source={getNotificationIcon(nt.message)}
+                  style={styles.icon}
+                />
+                <View style={styles.textContainer}>
+                  <View style={styles.itemHeader}>
+                    <PoppinsText weight="semibold">
+                      {getTranslatedTitle(nt)}
+                    </PoppinsText>
+                    <PoppinsText style={styles.date}>
+                      {formatRelativeDate(nt.createdAt)}
+                    </PoppinsText>
+                  </View>
+                  <PoppinsText style={styles.message}>
+                    {translateMessage(nt.message)}
                   </PoppinsText>
                 </View>
-                <PoppinsText style={styles.message}>
-                  {translateMessage(nt.message)}
-                </PoppinsText>
               </View>
-            </View>
+            </TouchableOpacity>
           ))}
         </ScrollView>
       )}
@@ -255,6 +305,7 @@ const styles = StyleSheet.create({
     paddingVertical: 12,
     borderBottomWidth: 1,
     borderBottomColor: Colors.bgColor,
+    backgroundColor: Colors.bgColor,
   },
   unreadBackground: {
     backgroundColor: '#FFFFFF',

From 185480bed5fd98202d5ab3eb9835261b467b8657 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 30 Apr 2025 19:58:00 -0400
Subject: [PATCH 186/291] improve notification state handling in
 NotificationsProvider

---
 src/hooks/useNotifications.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 49a9ad5..ecc0429 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -47,7 +47,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
         setNotifications(
           rawArray.map((n: NotificationResponse) => ({
             ...n,
-            isRead: Boolean(n.isRead), // Explicitly use the type from NotificationResponse
+            isRead: Boolean(n.isRead),
           })),
         );
       } else {
@@ -58,10 +58,20 @@ export function NotificationsProvider(props: { children: ReactNode }) {
     }
   }, []);
 
+  // carga inicial
   useEffect(() => {
     void refreshNotifications();
   }, [refreshNotifications]);
 
+  // polling automático cada 30 segundos
+  useEffect(() => {
+    const interval = setInterval(() => {
+      void refreshNotifications();
+    }, 10_000); // ajusta intervalo según necesidad
+
+    return () => clearInterval(interval);
+  }, [refreshNotifications]);
+
   const markAsRead = useCallback(async (notificationId: string) => {
     try {
       const token = await getUserIdFromSecureStore();
@@ -82,7 +92,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
 
   const markAsUnread = useCallback(async (notificationId: string) => {
     try {
-      // Si la API soporta 'unread', aquí iría la llamada a NotificationService.markAsUnread(...)
+      // Si la API soporta 'unread', aquí iría NotificationService.markAsUnread(...)
       setNotifications((prev) =>
         prev.map((n) =>
           n.id === notificationId ? { ...n, isRead: false } : n,

From 04ed32e343a1d05d77f5c91da520ec1c2c412cc0 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 30 Apr 2025 20:33:54 -0400
Subject: [PATCH 187/291] Adding order products to delivery flow

---
 src/screens/delivery/DeliveryDetailScreen.tsx | 131 ++++++++++---
 .../delivery/DeliveryHistoryDetailScreen.tsx  | 183 +++++++++++++-----
 2 files changed, 236 insertions(+), 78 deletions(-)

diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index f8d8b61..3af81bf 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  Image,
+} from 'react-native';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import {
   InformationCircleIcon,
@@ -16,7 +22,8 @@ import Alert from '../../components/Alerts';
 import { Colors, FontSizes } from '../../styles/theme';
 import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
-import { OrderDeliveryStatus } from '@pharmatech/sdk';
+import { OrderDeliveryStatus, OrderDetailedResponse } from '@pharmatech/sdk';
+import { UserService } from '../../services/user';
 import { useDispatch, useSelector } from 'react-redux';
 import { RootState } from '../../redux/store';
 import {
@@ -31,6 +38,40 @@ const DeliveryDetailScreen: React.FC = () => {
   const orderDetails = useSelector(
     (state: RootState) => state.delivery.orders[id as string],
   );
+  const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
+    undefined,
+  );
+  useEffect(() => {
+    const fetchOrder = async () => {
+      try {
+        if (!orderDetails) {
+          console.error(
+            'No se encontraron detalles de la orden de tipo delivery.',
+          );
+          return;
+        }
+
+        const orderId = orderDetails.orderId; // Extraer el ID de la orden
+        console.log('ID de la orden:', orderId);
+
+        const order = await UserService.getOrder(orderId); // Usar el ID de la orden
+
+        if (order.success) {
+          console.log('Datos del pedido:', order.data); // Log para verificar los datos
+          setOrder(order.data);
+        } else {
+          console.error('Error al obtener el pedido:', order.error);
+        }
+      } catch (error) {
+        console.error('Error en fetchOrder:', error);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchOrder();
+  }, [orderDetails]);
+
   const deliveryState = useSelector(
     (state: RootState) => state.delivery.deliveryState[id as string] || 0,
   );
@@ -342,28 +383,54 @@ const DeliveryDetailScreen: React.FC = () => {
         />
 
         {/* Pedido (contenido comentado) */}
-        {/* <PoppinsText weight="medium" style={styles.sectionTitle}>
-          Pedido
-        </PoppinsText>
-        <PoppinsText style={styles.totalProducts}>
-          Total: {products.length} productos
-        </PoppinsText>
-        {products.map((product) => (
-          <View key={product.id} style={styles.productCard}>
-            <View style={styles.productImagePlaceholder} />
-            <View>
-              <PoppinsText style={styles.productName}>
-                {product.productPresentation.product.name}
-              </PoppinsText>
-              <PoppinsText style={styles.productQuantity}>
-                Cantidad: {product.quantity}
-              </PoppinsText>
-              <PoppinsText style={styles.productPrice}>
-                Subtotal: ${product.subtotal.toFixed(2)}
-              </PoppinsText>
+        <View style={styles.sectionHeader}>
+          <PoppinsText weight="medium" style={styles.sectionTitle}>
+            Pedido
+          </PoppinsText>
+          <PoppinsText style={styles.totalProducts}>
+            Total:{' '}
+            {order?.details?.reduce(
+              (total, detail) => total + detail.quantity,
+              0,
+            ) || 0}{' '}
+            productos
+          </PoppinsText>
+        </View>
+        {order?.details?.map((detail, index) => {
+          console.log(`Producto ${index + 1}:`, detail); // Log para depuración
+          return (
+            <View
+              key={detail.productPresentation.id}
+              style={styles.productCard}
+            >
+              {/* Imagen del producto */}
+              <Image
+                source={{
+                  uri: detail.productPresentation.product.images[0]?.url,
+                }}
+                style={styles.productImage}
+                resizeMode="contain"
+              />
+              <View style={styles.productInfo}>
+                {/* Nombre de la presentación del producto */}
+                <PoppinsText
+                  style={styles.productName}
+                  numberOfLines={2} // Limitar a 2 líneas
+                  ellipsizeMode="tail" // Mostrar "..." si el texto es muy largo
+                >
+                  {detail.productPresentation.product.name}{' '}
+                  {detail.productPresentation.presentation.name}{' '}
+                  {detail.productPresentation.presentation.quantity}{' '}
+                  {detail.productPresentation.presentation.measurementUnit}
+                </PoppinsText>
+                {/* Cantidad del producto */}
+                <PoppinsText style={styles.productQuantity}>
+                  Cantidad: {detail.quantity}
+                </PoppinsText>
+              </View>
             </View>
-          </View>
-        ))} */}
+          );
+        })}
 
         {/* Espaciado adicional al final */}
         <View style={styles.scrollSpacer} />
@@ -421,11 +488,16 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.b1.lineHeight,
     color: Colors.primary,
   },
+  sectionHeader: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
   sectionTitle: {
     fontSize: FontSizes.s1.size,
     lineHeight: FontSizes.s1.lineHeight,
     color: Colors.primary,
-    marginBottom: 8,
   },
   locationsContainer: {
     position: 'relative',
@@ -514,8 +586,7 @@ const styles = StyleSheet.create({
   },
   totalProducts: {
     fontSize: FontSizes.b3.size,
-    color: Colors.textMain,
-    marginBottom: 8,
+    color: Colors.textLowContrast,
   },
   productCard: {
     flexDirection: 'row',
@@ -524,21 +595,27 @@ const styles = StyleSheet.create({
     borderRadius: 16,
     padding: 16,
     marginBottom: 16,
+    overflow: 'hidden', // Asegura que el contenido no se salga de la carta
   },
-  productImagePlaceholder: {
+  productImage: {
     width: 50,
     height: 50,
     backgroundColor: Colors.gray_100,
     borderRadius: 8,
     marginRight: 16,
   },
+  productInfo: {
+    flex: 1, // Permite que el contenido ocupe el espacio restante
+  },
   productName: {
     fontSize: FontSizes.b2.size,
     color: Colors.textMain,
+    flexShrink: 1, // Evita que el texto desborde
   },
   productQuantity: {
     fontSize: FontSizes.b3.size,
     color: Colors.textLowContrast,
+    marginTop: 4,
   },
   productPrice: {
     fontSize: FontSizes.b3.size,
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
index 1512cda..1d1b4c3 100644
--- a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  Image,
+} from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
 import { PhoneIcon, EnvelopeIcon } from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
@@ -9,7 +15,12 @@ import HistoryMap from '../../components/HistoryMap';
 import { Colors, FontSizes } from '../../styles/theme';
 import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
-import { OrderDeliveryDetailedResponse, BranchResponse } from '@pharmatech/sdk';
+import {
+  OrderDeliveryDetailedResponse,
+  BranchResponse,
+  OrderDetailedResponse,
+} from '@pharmatech/sdk';
+import { UserService } from '../../services/user';
 
 const DeliveryHistoryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
@@ -20,9 +31,39 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
   );
   const [loading, setLoading] = useState(true);
 
+  const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
+    undefined,
+  );
+  useEffect(() => {
+    const fetchOrder = async () => {
+      try {
+        if (!orderDetails) {
+          return; // No intentes cargar si no hay detalles de la orden
+        }
+
+        const orderId = orderDetails.orderId; // Extraer el ID de la orden
+        console.log('ID de la orden:', orderId);
+
+        const order = await UserService.getOrder(orderId); // Usar el ID de la orden
+
+        if (order.success) {
+          console.log('Datos del pedido:', order.data); // Log para verificar los datos
+          setOrder(order.data);
+        } else {
+          console.error('Error al obtener el pedido:', order.error);
+        }
+      } catch (error) {
+        console.error('Error en fetchOrder:', error);
+      }
+    };
+
+    fetchOrder();
+  }, [orderDetails]);
+
   useEffect(() => {
     const fetchOrderDetails = async () => {
       try {
+        setLoading(true); // Inicia la carga
         if (!id) {
           throw new Error('ID del pedido no proporcionado');
         }
@@ -40,7 +81,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
       } catch (error) {
         console.error('Error al obtener los detalles del pedido:', error);
       } finally {
-        setLoading(false);
+        setLoading(false); // Finaliza la carga
       }
     };
 
@@ -241,26 +282,56 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
           }}
         />
 
-        {/* Pedido 
-        <PoppinsText weight="medium" style={styles.sectionTitle}>
-          Pedido
-        </PoppinsText>
-        <PoppinsText style={styles.totalProducts}>
-          Total: {orderData.products?.length || 0} productos
-        </PoppinsText>
-        {orderData.products?.map((product: Product) => (
-          <View key={product.id} style={styles.productCard}>
-            <View style={styles.productImagePlaceholder} />
-            <View>
-              <PoppinsText style={styles.productName}>
-                {product.name}
-              </PoppinsText>
-              <PoppinsText style={styles.productQuantity}>
-                Cantidad: {product.quantity}
-              </PoppinsText>
+        {/* Pedido */}
+        <View style={styles.sectionHeader}>
+          <PoppinsText weight="medium" style={styles.sectionTitle}>
+            Pedido
+          </PoppinsText>
+          <PoppinsText style={styles.totalProducts}>
+            Total:{' '}
+            {order?.details?.reduce(
+              (total, detail) => total + detail.quantity,
+              0,
+            ) || 0}{' '}
+            productos
+          </PoppinsText>
+        </View>
+        {order?.details?.map((detail, index) => {
+          console.log(`Producto ${index + 1}:`, detail); // Log para depuración
+          return (
+            <View
+              key={detail.productPresentation.id}
+              style={styles.productCard}
+            >
+              {/* Imagen del producto */}
+              <Image
+                source={{
+                  uri: detail.productPresentation.product.images[0]?.url,
+                }}
+                style={styles.productImage}
+                resizeMode="contain"
+              />
+              <View style={styles.productInfo}>
+                {/* Nombre de la presentación del producto */}
+                <PoppinsText
+                  style={styles.productName}
+                  numberOfLines={2} // Limitar a 2 líneas
+                  ellipsizeMode="tail" // Mostrar "..." si el texto es muy largo
+                >
+                  {detail.productPresentation.product.name}{' '}
+                  {detail.productPresentation.presentation.name}{' '}
+                  {detail.productPresentation.presentation.quantity}{' '}
+                  {detail.productPresentation.presentation.measurementUnit}
+                </PoppinsText>
+                {/* Cantidad del producto */}
+                <PoppinsText style={styles.productQuantity}>
+                  Cantidad: {detail.quantity}
+                </PoppinsText>
+              </View>
             </View>
-          </View>
-        ))}*/}
+          );
+        })}
+
         <View style={styles.scrollSpacer} />
       </ScrollView>
     </View>
@@ -312,11 +383,49 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.b1.lineHeight,
     color: Colors.textMain,
   },
+  sectionHeader: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    marginBottom: 8,
+  },
   sectionTitle: {
     fontSize: FontSizes.s1.size,
     lineHeight: FontSizes.s1.lineHeight,
     color: Colors.primary,
-    marginBottom: 8,
+  },
+  totalProducts: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 16,
+    padding: 16,
+    marginBottom: 16,
+    overflow: 'hidden',
+  },
+  productImage: {
+    width: 50,
+    height: 50,
+    backgroundColor: Colors.gray_100,
+    borderRadius: 8,
+    marginRight: 16,
+  },
+  productInfo: {
+    flex: 1,
+  },
+  productName: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textMain,
+    flexShrink: 1,
+  },
+  productQuantity: {
+    fontSize: FontSizes.b3.size,
+    color: Colors.textLowContrast,
+    marginTop: 4,
   },
   locationsContainer: {
     position: 'relative',
@@ -483,34 +592,6 @@ const styles = StyleSheet.create({
     borderRadius: 16,
     marginBottom: 16,
   },
-  totalProducts: {
-    fontSize: FontSizes.b3.size,
-    color: Colors.textMain,
-    marginBottom: 8,
-  },
-  productCard: {
-    flexDirection: 'row',
-    alignItems: 'center',
-    backgroundColor: Colors.menuWhite,
-    borderRadius: 16,
-    padding: 16,
-    marginBottom: 16,
-  },
-  productImagePlaceholder: {
-    width: 50,
-    height: 50,
-    backgroundColor: Colors.gray_100,
-    borderRadius: 8,
-    marginRight: 16,
-  },
-  productName: {
-    fontSize: FontSizes.b2.size,
-    color: Colors.textMain,
-  },
-  productQuantity: {
-    fontSize: FontSizes.b3.size,
-    color: Colors.textLowContrast,
-  },
   floatingButton: {
     position: 'absolute',
     bottom: 16,

From 6a667d14c038b9f940f2c2fe04a5b155afdd5a1f Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 1 May 2025 00:33:58 -0400
Subject: [PATCH 188/291] Handle no image update

---
 src/components/Avatar.tsx     | 5 ++++-
 src/screens/ProfileScreen.tsx | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/components/Avatar.tsx b/src/components/Avatar.tsx
index ea715e9..facb744 100644
--- a/src/components/Avatar.tsx
+++ b/src/components/Avatar.tsx
@@ -44,7 +44,10 @@ const Avatar: React.FC<AvatarProps> = ({ scale = 32 }) => {
         const { firstName, lastName } = response.data!;
         const profilePicture = response.data.profile.profilePicture;
         setProfile({
-          uri: profilePicture,
+          uri:
+            profilePicture !== 'https://via.placeholder.com/150'
+              ? profilePicture
+              : '',
           name: `${firstName} ${lastName}`,
         });
       } else {
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 4ad4586..26752ca 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -98,6 +98,8 @@ const ProfileScreen = () => {
         const imageResponse = await ImageService.uploadImage(image);
         if (imageResponse)
           updatedProfile.profilePicture = imageResponse.secure_url;
+      } else {
+        updatedProfile.profilePicture = 'https://via.placeholder.com/150';
       }
 
       const response = await UserService.updateProfile(updatedProfile);

From 71087b1f66c84761bda096f634d037efea4ab8e8 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 1 May 2025 00:35:42 -0400
Subject: [PATCH 189/291] updated alert position

---
 src/screens/ProfileScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 26752ca..fed6326 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -316,7 +316,7 @@ const styles = StyleSheet.create({
     width: 326,
     left: '56%',
     marginLeft: -162,
-    top: 60,
+    top: 40,
     right: 0,
     zIndex: 1000,
   },

From 0be0b1fde27e24d4d66df3934112d188252e46b1 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 1 May 2025 10:42:29 -0400
Subject: [PATCH 190/291] Update date formatting in NotificationsScreen to use
 'Hace' instead of 'alrededor de'

---
 src/screens/NotificationsScreen.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 4fb1e12..ef103b3 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -153,7 +153,10 @@ export default function NotificationsScreen() {
     const date = parseISO(dateString);
     const daysDiff = differenceInDays(new Date(), date);
     if (daysDiff <= 7) {
-      return formatDistanceToNow(date, { locale: es, addSuffix: true });
+      return formatDistanceToNow(date, { locale: es }).replace(
+        'alrededor de ',
+        'Hace ',
+      );
     }
     return format(date, 'yyyy-MM-dd', { locale: es });
   };

From 8b65094fcbbbe50b10e38e08f69bc6738907788e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 2 May 2025 19:47:59 -0400
Subject: [PATCH 191/291] Active Orders

---
 src/app/_layout.tsx                |   7 ++
 src/app/active-orders.tsx          |   3 +
 src/components/TopBar.tsx          |  14 ++-
 src/screens/ActiveOrdersScreen.tsx | 175 +++++++++++++++++++++++++++++
 4 files changed, 198 insertions(+), 1 deletion(-)
 create mode 100644 src/app/active-orders.tsx
 create mode 100644 src/screens/ActiveOrdersScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 45edad1..d0022fb 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -150,6 +150,13 @@ export default function RootLayout() {
             headerShown: false,
           }}
         />
+        <Stack.Screen
+          name="active-orders"
+          options={{
+            headerTitle: '',
+            headerTransparent: true,
+          }}
+        />
       </Stack>
     </Provider>
   );
diff --git a/src/app/active-orders.tsx b/src/app/active-orders.tsx
new file mode 100644
index 0000000..96416d0
--- /dev/null
+++ b/src/app/active-orders.tsx
@@ -0,0 +1,3 @@
+import ActiveOrdersScreen from '../screens/ActiveOrdersScreen';
+
+export default ActiveOrdersScreen;
diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index d73577e..08bed7b 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -1,6 +1,9 @@
 import React, { useState } from 'react';
 import { View, StyleSheet, TouchableOpacity } from 'react-native';
-import { ShoppingCartIcon } from 'react-native-heroicons/outline';
+import {
+  ShoppingCartIcon,
+  ClipboardIcon,
+} from 'react-native-heroicons/outline';
 import Logo from '../assets/images/logos/PharmaTech_Logo.svg';
 import SearchInput from './SearchInput';
 import { Colors } from '../styles/theme';
@@ -54,6 +57,15 @@ const TopBar = () => {
           <AvatarWithMenu />
         </View>
 
+        <TouchableOpacity
+          style={[styles.iconButton, { marginLeft: 40 }]}
+          onPress={() => {
+            router.push('/active-orders');
+          }}
+        >
+          <ClipboardIcon size={26} color={Colors.textMain} />
+        </TouchableOpacity>
+
         {/* Logo */}
         <View style={styles.logoContainer}>
           <Logo width={118} height={48} />
diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
new file mode 100644
index 0000000..2573342
--- /dev/null
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -0,0 +1,175 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { useRouter } from 'expo-router';
+import Alert from '../components/Alerts';
+import Button from '../components/Button';
+import { OrderResponse } from '@pharmatech/sdk';
+import { UserService } from '../services/user';
+import { truncateString } from '../utils/commons';
+
+const ActiveOrdersScreen = () => {
+  const [activeOrdersList, setActiveOrdersList] = useState<
+    OrderResponse[] | undefined
+  >(undefined);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showInfoAlert, setShowInfoAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchActiveOrders = async () => {
+      try {
+        const order = await UserService.getUserOrders();
+        if (order.success) {
+          const activeOrders = order.data.results.filter(
+            (o) => o.status === 'requested' || o.status === 'approved', // Include requested and approved statuses
+          );
+          if (activeOrders.length > 0) {
+            setActiveOrdersList(activeOrders);
+          } else {
+            setShowInfoAlert(true);
+          }
+        }
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ha ocurrido un error');
+        setShowErrorAlert(true);
+      }
+    };
+
+    fetchActiveOrders();
+  }, []);
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showInfoAlert && (
+          <Alert
+            type="info"
+            title="No tiene pedidos activos"
+            message="No tiene pedidos activos"
+            onClose={() => {
+              setShowInfoAlert(false);
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      <View style={styles.orderHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
+          Pedidos Activos
+        </PoppinsText>
+      </View>
+      <View style={styles.orderInfo}>
+        {activeOrdersList &&
+          activeOrdersList.length > 0 &&
+          activeOrdersList.map((order, index) => (
+            <View
+              key={index}
+              style={{
+                flexDirection: 'row',
+                paddingHorizontal: 10,
+                borderWidth: 1,
+                borderColor: Colors.gray_100,
+                marginVertical: 5,
+                backgroundColor: Colors.textWhite,
+                borderRadius: 10,
+              }}
+            >
+              <View style={{ paddingVertical: 10, flex: 1 }}>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                  }}
+                >
+                  <View>
+                    <PoppinsText>
+                      {order ? truncateString(order?.id, 8) : ''}
+                    </PoppinsText>
+                    <PoppinsText style={{ color: Colors.textLowContrast }}>
+                      {new Date(order.createdAt).toLocaleDateString()}
+                    </PoppinsText>
+                  </View>
+                  <PoppinsText>${order.totalPrice.toFixed(2)}</PoppinsText>
+                </View>
+                <View
+                  style={{
+                    flexDirection: 'row',
+                    justifyContent: 'space-between',
+                    alignItems: 'center',
+                    marginTop: 5,
+                  }}
+                >
+                  <PoppinsText
+                    style={{
+                      padding: 5,
+                      backgroundColor: Colors.semanticDanger,
+                      borderRadius: 5,
+                      width: 80,
+                      textAlign: 'center',
+                      color: Colors.textWhite,
+                      fontSize: FontSizes.c1.size,
+                    }}
+                  >
+                    {order.status}
+                  </PoppinsText>
+                  <TouchableOpacity
+                    onPress={() => router.push(`order/${order.id}`)}
+                  >
+                    <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
+                      Ver detalles
+                    </PoppinsText>
+                  </TouchableOpacity>
+                  <Button
+                    title="Re ordenar"
+                    size="small"
+                    style={{ paddingVertical: 0 }}
+                  />
+                </View>
+              </View>
+            </View>
+          ))}
+      </View>
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  orderHeader: {
+    alignItems: 'center',
+    marginTop: 30,
+    marginBottom: 15,
+  },
+  orderInfo: {
+    marginVertical: 5,
+  },
+});
+
+export default ActiveOrdersScreen;

From d1e66277d4925c71ee6991dce4d3853202d5d838 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 3 May 2025 11:16:20 -0400
Subject: [PATCH 192/291] Enhance ActiveOrdersScreen: Add status labels and
 colors for order statuses

---
 src/screens/ActiveOrdersScreen.tsx | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 2573342..c8940d1 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -9,6 +9,20 @@ import { OrderResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
 
+const STATUS_LABELS: Record<string, string> = {
+  requested: 'Pendiente',
+  ready_for_pickup: 'A Enviar',
+  in_progress: 'En Proceso',
+  approved: 'Aprobado',
+};
+
+const STATUS_COLORS: Record<string, string> = {
+  requested: Colors.semanticDanger,
+  ready_for_pickup: Colors.semanticInfo,
+  in_progress: Colors.secondaryGray,
+  approved: Colors.secondary,
+};
+
 const ActiveOrdersScreen = () => {
   const [activeOrdersList, setActiveOrdersList] = useState<
     OrderResponse[] | undefined
@@ -24,7 +38,11 @@ const ActiveOrdersScreen = () => {
         const order = await UserService.getUserOrders();
         if (order.success) {
           const activeOrders = order.data.results.filter(
-            (o) => o.status === 'requested' || o.status === 'approved', // Include requested and approved statuses
+            (o) =>
+              o.status === 'requested' ||
+              o.status === 'approved' ||
+              o.status === 'ready_for_pickup' ||
+              o.status === 'in_progress',
           );
           if (activeOrders.length > 0) {
             setActiveOrdersList(activeOrders);
@@ -116,15 +134,16 @@ const ActiveOrdersScreen = () => {
                   <PoppinsText
                     style={{
                       padding: 5,
-                      backgroundColor: Colors.semanticDanger,
+                      backgroundColor:
+                        STATUS_COLORS[order.status] || Colors.semanticDanger,
                       borderRadius: 5,
                       width: 80,
-                      textAlign: 'center',
                       color: Colors.textWhite,
                       fontSize: FontSizes.c1.size,
+                      textAlign: 'center',
                     }}
                   >
-                    {order.status}
+                    {STATUS_LABELS[order.status] || order.status}
                   </PoppinsText>
                   <TouchableOpacity
                     onPress={() => router.push(`order/${order.id}`)}

From 708449d6e6942b012eb7016c4dc9e531d377e994 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 4 May 2025 11:44:59 -0400
Subject: [PATCH 193/291] Including nativewind-env in tsconfig

---
 tsconfig.json | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index 6439257..e3905d3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -12,6 +12,11 @@
     "strict": true,
     "target": "esnext"
   },
-  "include": ["**/*.ts", "**/*.tsx", "src/types/**/*.d.ts"],
+  "include": [
+    "**/*.ts",
+    "**/*.tsx",
+    "src/types/**/*.d.ts",
+    "nativewind-env.d.ts"
+  ],
   "exclude": ["node_modules"]
 }

From 4838abebe8b335b386f37bacb2d956401006a6d9 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 4 May 2025 16:36:51 -0400
Subject: [PATCH 194/291] Minor style fixes

---
 src/components/TopBar.tsx           | 15 ++++++----
 src/screens/NotificationsScreen.tsx | 43 +++++++++++++++++++++++------
 2 files changed, 44 insertions(+), 14 deletions(-)

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index e9cc640..6fbb00a 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -63,14 +63,14 @@ const TopBar = () => {
         </View>
 
         <TouchableOpacity
-          style={{ paddingRight: 5 }}
+          style={{ paddingRight: 8 }}
           onPress={() => {
             router.push('/notifications');
           }}
         >
           <BellIcon size={26} color={Colors.textMain} />
           {unreadCount > 0 && (
-            <View style={styles.badgeContainer}>
+            <View style={styles.badgeContainerBell}>
               <Badge variant="filled" color="danger" size="tiny">
                 {unreadCount}
               </Badge>
@@ -164,16 +164,21 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center',
-    marginLeft: 55,
+    marginLeft: 55 + 8,
   },
   iconButton: {
-    paddingRight: 5,
+    paddingRight: 4,
     position: 'relative',
   },
+  badgeContainerBell: {
+    position: 'absolute',
+    top: -5,
+    right: 4,
+  },
   badgeContainer: {
     position: 'absolute',
     top: -5,
-    right: -5,
+    right: -2,
   },
   searchInput: {
     backgroundColor: Colors.menuWhite,
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index ef103b3..382b5f6 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -17,9 +17,8 @@ import {
   format,
 } from 'date-fns';
 import { es } from 'date-fns/locale';
-
+import { ChevronLeftIcon } from 'react-native-heroicons/solid';
 import TopBar from '../components/TopBar';
-import Return from '../components/Return';
 import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
 // Importamos y casteamos explicitamente el ícono por defecto
@@ -208,6 +207,32 @@ export default function NotificationsScreen() {
   return (
     <View style={styles.container}>
       <TopBar />
+      <TouchableOpacity
+        onPress={() => navigation.goBack()}
+        style={{
+          paddingHorizontal: 10,
+          marginBottom: -4,
+          flexDirection: 'row',
+          alignSelf: 'flex-start',
+        }}
+      >
+        <ChevronLeftIcon
+          width={20}
+          height={20}
+          color={Colors.primary}
+          style={{ marginRight: 2, marginLeft: 6 }}
+        />
+        <PoppinsText
+          weight="medium"
+          style={{
+            fontSize: FontSizes.b1.size,
+            lineHeight: FontSizes.b1.lineHeight,
+            color: Colors.primary,
+          }}
+        >
+          Volver
+        </PoppinsText>
+      </TouchableOpacity>
 
       {showErrorAlert && (
         <View style={styles.alertContainer}>
@@ -222,7 +247,6 @@ export default function NotificationsScreen() {
       )}
 
       <View style={styles.header}>
-        <Return onClose={() => navigation.goBack()} />
         <PoppinsText style={styles.title}>Notificaciones</PoppinsText>
       </View>
 
@@ -274,7 +298,10 @@ export default function NotificationsScreen() {
 }
 
 const styles = StyleSheet.create({
-  container: { flex: 1, backgroundColor: Colors.bgColor },
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
   alertContainer: {
     position: 'absolute',
     top: 20,
@@ -285,14 +312,12 @@ const styles = StyleSheet.create({
   },
   header: {
     flexDirection: 'row',
-    alignItems: 'center',
-    paddingHorizontal: 20,
-    paddingTop: 15,
+    paddingTop: 16,
   },
   title: {
     fontSize: FontSizes.s1.size,
-    marginLeft: 40,
-    color: Colors.textMain,
+    color: Colors.primary,
+    marginLeft: 20,
   },
   loader: { marginTop: 40 },
   emptyContainer: {

From 4c4119add7544d1da7108d3f45cd753f3f1c700a Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 4 May 2025 17:12:19 -0400
Subject: [PATCH 195/291] Minor style fix

---
 src/components/TopBar.tsx | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index dd1ff65..c12b78b 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -177,7 +177,6 @@ const styles = StyleSheet.create({
     flex: 1,
     alignItems: 'center',
     justifyContent: 'center',
-    marginLeft: 55 + 8,
   },
   iconButton: {
     paddingRight: 4,

From b638417cf9a2b26c9e24e5bf2f3aecef7fc0d145 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 5 May 2025 15:23:56 -0400
Subject: [PATCH 196/291] Creating branches flow

---
 src/app/_layout.tsx                   |   1 +
 src/app/branchDetail/[id].tsx         |   2 +
 src/app/branchDetail/_layout.tsx      |  38 ++++
 src/components/BranchCard.tsx         |  45 +++++
 src/screens/BranchDetailScreen.tsx    | 245 ++++++++++++++++++++++++++
 src/screens/DirectionChangeScreen.tsx |  13 +-
 src/screens/DirectionCreateScreen.tsx |   4 +-
 src/screens/ProductDetailScreen.tsx   |   2 +-
 src/screens/tab/BranchesScreen.tsx    | 196 ++++++++++++++++++++-
 src/services/branches.ts              |  17 +-
 src/services/inventory.ts             |  23 ++-
 src/services/state.ts                 |  27 +--
 src/styles/theme.ts                   |   4 +-
 13 files changed, 589 insertions(+), 28 deletions(-)
 create mode 100644 src/app/branchDetail/[id].tsx
 create mode 100644 src/app/branchDetail/_layout.tsx
 create mode 100644 src/components/BranchCard.tsx
 create mode 100644 src/screens/BranchDetailScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 8c5c893..6fea0a0 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -161,6 +161,7 @@ export default function RootLayout() {
             name="deliveryDetail"
             options={{ headerShown: false }}
           />
+          <Stack.Screen name="branchDetail" options={{ headerShown: false }} />
           <Stack.Screen
             name="deliveryHistoryDetail"
             options={{ headerShown: false }}
diff --git a/src/app/branchDetail/[id].tsx b/src/app/branchDetail/[id].tsx
new file mode 100644
index 0000000..b37d3f7
--- /dev/null
+++ b/src/app/branchDetail/[id].tsx
@@ -0,0 +1,2 @@
+import BranchDetailScreen from '../../screens/BranchDetailScreen';
+export default BranchDetailScreen;
diff --git a/src/app/branchDetail/_layout.tsx b/src/app/branchDetail/_layout.tsx
new file mode 100644
index 0000000..c4d9d43
--- /dev/null
+++ b/src/app/branchDetail/_layout.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Stack } from 'expo-router';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+
+export default function BranchDetailLayout() {
+  return (
+    <Stack
+      screenOptions={({ navigation }) => ({
+        headerShown: true,
+        headerTransparent: true,
+        headerTitle: '',
+        headerLeft: () =>
+          navigation.canGoBack() ? (
+            <View style={styles.iconContainer}>
+              <TouchableOpacity
+                onPress={navigation.goBack}
+                style={{
+                  padding: 12, // Aumentado
+                  marginLeft: -12,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon width={28} height={28} color="#000" />
+              </TouchableOpacity>
+            </View>
+          ) : null,
+      })}
+    />
+  );
+}
+
+const styles = StyleSheet.create({
+  iconContainer: {
+    marginLeft: -8,
+  },
+});
diff --git a/src/components/BranchCard.tsx b/src/components/BranchCard.tsx
new file mode 100644
index 0000000..e6dd46a
--- /dev/null
+++ b/src/components/BranchCard.tsx
@@ -0,0 +1,45 @@
+import React from 'react';
+import { StyleSheet, TouchableOpacity } from 'react-native';
+import { BranchResponse } from '@pharmatech/sdk';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+
+type BranchCardProps = {
+  branch: BranchResponse;
+  onPress: () => void;
+};
+
+const BranchCard: React.FC<BranchCardProps> = ({ branch, onPress }) => {
+  return (
+    <TouchableOpacity style={styles.card} onPress={onPress}>
+      <PoppinsText style={styles.name}>{branch.name}</PoppinsText>
+      <PoppinsText style={styles.address}>{branch.address}</PoppinsText>
+    </TouchableOpacity>
+  );
+};
+
+const styles = StyleSheet.create({
+  card: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 16,
+    marginBottom: 10,
+    shadowColor: '#000',
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  name: {
+    fontSize: FontSizes.s2.size,
+    lineHeight: FontSizes.s2.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
+  },
+  address: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.textLowContrast,
+  },
+});
+
+export default BranchCard;
diff --git a/src/screens/BranchDetailScreen.tsx b/src/screens/BranchDetailScreen.tsx
new file mode 100644
index 0000000..7252344
--- /dev/null
+++ b/src/screens/BranchDetailScreen.tsx
@@ -0,0 +1,245 @@
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  FlatList,
+  TouchableOpacity,
+  Image,
+} from 'react-native';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { BranchService } from '../services/branches';
+import { ProductService } from '../services/products'; // Importar el servicio de productos
+import { InventoryService } from '../services/inventory'; // Importar el servicio de inventario
+import { BranchResponse, ProductPresentation } from '@pharmatech/sdk';
+import BranchMapModal from '../components/BranchMapModal';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { usePagination } from '../hooks/usePagination';
+
+export default function BranchDetailScreen() {
+  const { id } = useLocalSearchParams<{ id: string }>();
+  const [branch, setBranch] = useState<BranchResponse | null>(null);
+  const [mapVisible, setMapVisible] = useState(false);
+
+  const router = useRouter();
+
+  const {
+    data: products,
+    fetchData,
+    loading,
+    hasMore,
+  } = usePagination<ProductPresentation & { stockQuantity: number }>(
+    async (page) => {
+      const [productResponse, inventoryResponse] = await Promise.all([
+        ProductService.getProducts(page, 10, { branchId: [id!] }),
+        InventoryService.getBranchInventory({ page, limit: 10, branchId: id! }),
+      ]);
+
+      if (!productResponse.success || !inventoryResponse) {
+        return { data: [], next: null };
+      }
+
+      // Map inventory stockQuantity to products
+      const inventoryMap = new Map(
+        inventoryResponse.results.map((item) => [
+          item.productPresentation.id,
+          item.stockQuantity,
+        ]),
+      );
+
+      const productsWithStock = productResponse.data.results.map((product) => ({
+        ...product,
+        stockQuantity: inventoryMap.get(product.id) || 0, // Default to 0 if not found
+      }));
+
+      return {
+        data: productsWithStock,
+        next: productResponse.data.next,
+      };
+    },
+  );
+
+  useEffect(() => {
+    if (!id) {
+      console.error('El ID de la sucursal no está definido.');
+      return;
+    }
+
+    const fetchBranchDetails = async () => {
+      try {
+        const branchData = await BranchService.getById(id);
+        setBranch(branchData);
+      } catch (error) {
+        console.error('Error fetching branch details:', error);
+      }
+    };
+
+    fetchBranchDetails();
+  }, [id]);
+
+  const renderProduct = ({
+    item,
+  }: {
+    item: ProductPresentation & { stockQuantity: number };
+  }) => {
+    const { product, presentation, stockQuantity } = item;
+
+    return (
+      <TouchableOpacity
+        style={styles.productCard}
+        onPress={() =>
+          router.push(`/products/${product.id}/presentation/${presentation.id}`)
+        }
+      >
+        <Image
+          source={{
+            uri: product.images?.[0]?.url || 'https://via.placeholder.com/60',
+          }}
+          style={styles.productImage}
+        />
+        <View style={styles.productInfo}>
+          <PoppinsText style={styles.productName}>
+            {product.name || 'Nombre no disponible'} {presentation.name}{' '}
+            {presentation.quantity} {presentation.measurementUnit}
+          </PoppinsText>
+          <PoppinsText style={styles.productQuantity}>
+            Cantidad disponible en sucursal: {stockQuantity}
+          </PoppinsText>
+        </View>
+      </TouchableOpacity>
+    );
+  };
+
+  if (loading && products.length === 0) {
+    return (
+      <View style={styles.loadingContainer}>
+        <PoppinsText style={styles.loadingText}>Cargando...</PoppinsText>
+      </View>
+    );
+  }
+
+  return (
+    <View style={styles.container}>
+      {branch ? (
+        <>
+          <PoppinsText style={styles.title}>{branch.name}</PoppinsText>
+          <PoppinsText style={styles.address}>{branch.address}</PoppinsText>
+          <TouchableOpacity
+            style={styles.mapButton}
+            onPress={() => setMapVisible(true)}
+          >
+            <PoppinsText style={styles.mapButtonText}>
+              Ver en el mapa
+            </PoppinsText>
+          </TouchableOpacity>
+        </>
+      ) : (
+        <PoppinsText style={styles.loadingText}>
+          No se pudo cargar la información de la sucursal.
+        </PoppinsText>
+      )}
+      <FlatList
+        data={products}
+        keyExtractor={(item) => item.id}
+        renderItem={renderProduct}
+        contentContainerStyle={styles.list}
+        onEndReached={hasMore ? fetchData : null}
+        onEndReachedThreshold={0.5}
+        ListEmptyComponent={
+          !loading ? (
+            <PoppinsText style={styles.emptyText}>
+              No hay productos disponibles.
+            </PoppinsText>
+          ) : null
+        }
+      />
+      {branch && (
+        <BranchMapModal
+          visible={mapVisible}
+          onClose={() => setMapVisible(false)}
+          branchName={branch.name}
+          branchCoordinates={{
+            latitude: branch.latitude,
+            longitude: branch.longitude,
+          }}
+        />
+      )}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 16,
+  },
+  title: {
+    fontSize: FontSizes.h4.size,
+    color: Colors.textMain,
+    marginBottom: 10,
+  },
+  address: {
+    fontSize: FontSizes.b2.size,
+    color: Colors.textLowContrast,
+    marginBottom: 20,
+  },
+  mapButton: {
+    backgroundColor: Colors.primary,
+    padding: 10,
+    borderRadius: 8,
+    marginBottom: 20,
+  },
+  mapButtonText: {
+    color: Colors.textWhite,
+    textAlign: 'center',
+    fontSize: FontSizes.b1.size,
+  },
+  list: {
+    marginTop: 10,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 10,
+    marginBottom: 10,
+    shadowColor: '#000',
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  productImage: {
+    width: 60,
+    height: 60,
+    borderRadius: 8,
+    marginRight: 10,
+  },
+  productInfo: {
+    flex: 1,
+  },
+  productName: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.textMain,
+    marginBottom: 4,
+  },
+  productQuantity: {
+    fontSize: FontSizes.c1.size,
+    color: Colors.textLowContrast,
+  },
+  emptyText: {
+    textAlign: 'center',
+    color: Colors.textLowContrast,
+    marginTop: 20,
+  },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  loadingText: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.textLowContrast,
+  },
+});
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 323db8f..26ebc2b 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -36,7 +36,7 @@ const ChangeDirectionScreen = () => {
     const fetchStates = async () => {
       const states = await StateService.getStates(1, 40);
       if (states.success) {
-        setStates(states.data.results);
+        setStates(states.data?.results ?? []);
       }
     };
     fetchStates();
@@ -46,7 +46,7 @@ const ChangeDirectionScreen = () => {
     const fetchCities = async () => {
       const cities = await StateService.getCities(1, 40, selectedState);
       if (cities.success) {
-        setCities(cities.data.results);
+        setCities(cities.data?.results ?? []);
       }
     };
     fetchCities();
@@ -62,9 +62,12 @@ const ChangeDirectionScreen = () => {
 
           const city = await StateService.getCity(address.data.cityId);
           if (city.success) {
-            setSelectedCity(city.data.name);
-            const state = await StateService.getState(city.data.state.id);
-            if (state.success) setSelectedState(state.data.name);
+            setSelectedCity(city.data?.name ?? '');
+            const state = city.data
+              ? await StateService.getState(city.data.state.id)
+              : null;
+            if (state && state.success && state.data)
+              setSelectedState(state.data.name);
           }
         }
       } catch (error) {
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index f91ce3a..35f3ca8 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -46,7 +46,7 @@ const DirectionCreateScreen = () => {
     const fetchStates = async () => {
       const states = await StateService.getStates(1, 40);
       if (states.success) {
-        setStates(states.data.results);
+        setStates(states.data?.results ?? []);
       }
     };
     fetchStates();
@@ -56,7 +56,7 @@ const DirectionCreateScreen = () => {
     const fetchCities = async () => {
       const cities = await StateService.getCities(1, 40, selectedState);
       if (cities.success) {
-        setCities(cities.data.results);
+        setCities(cities.data?.results ?? []);
       }
     };
     fetchCities();
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 5e5389f..de0b5b0 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -153,7 +153,7 @@ const ProductDetailScreen: React.FC = () => {
       if (productImages.success) setImages(productImages.data);
       if (productPresentations.success)
         setPresentations(productPresentations.data);
-      if (states.success) setStates(states.data.results);
+      if (states.success) setStates(states.data?.results || []);
     };
 
     obtainProduct();
diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index bc40068..a4ab2cf 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -1,12 +1,139 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  FlatList,
+  TouchableOpacity,
+  Modal,
+  Pressable,
+} from 'react-native';
+import { StateService } from '../../services/state';
+import { BranchService } from '../../services/branches';
+import { StateResponse, BranchResponse } from '@pharmatech/sdk';
+import BranchCard from '../../components/BranchCard';
+import { Colors, FontSizes } from '../../styles/theme';
+import { useRouter } from 'expo-router';
 import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
 
 export default function BranchesScreen() {
+  const [states, setStates] = useState<StateResponse[]>([]);
+  const [branches, setBranches] = useState<BranchResponse[]>([]);
+  const [selectedState, setSelectedState] = useState<string | null>(null);
+  const [loading, setLoading] = useState(false);
+  const [modalVisible, setModalVisible] = useState(false);
+  const router = useRouter();
+
+  // Cargar todos los estados al inicio
+  useEffect(() => {
+    const fetchStates = async () => {
+      setLoading(true);
+      const response = await StateService.getStates(1, 100);
+      if (response.success && response.data) setStates(response.data.results);
+      setLoading(false);
+    };
+    fetchStates();
+  }, []);
+
+  // Cargar sucursales al seleccionar un estado
+  useEffect(() => {
+    if (selectedState) {
+      const fetchBranches = async () => {
+        setLoading(true);
+        const response = await BranchService.findAll({
+          stateId: selectedState,
+        });
+        if (response.results) setBranches(response.results);
+        setLoading(false);
+      };
+      fetchBranches();
+    }
+  }, [selectedState]);
+
   return (
     <View style={styles.container}>
-      <PoppinsText>Pantalla Sucursales</PoppinsText>
+      <PoppinsText weight="medium" style={styles.title}>
+        Selecciona un estado
+      </PoppinsText>
+      <FlatList
+        data={states}
+        keyExtractor={(item) => item.id}
+        renderItem={({ item }) => (
+          <TouchableOpacity
+            style={styles.stateCard}
+            onPress={() => {
+              setSelectedState(item.id);
+              setModalVisible(true);
+            }}
+          >
+            <PoppinsText style={styles.stateName}>{item.name}</PoppinsText>
+          </TouchableOpacity>
+        )}
+        contentContainerStyle={styles.list}
+        ListEmptyComponent={
+          !loading ? (
+            <PoppinsText style={styles.emptyText}>
+              No hay estados disponibles.
+            </PoppinsText>
+          ) : null
+        }
+      />
+
+      {/* Modal para mostrar las sucursales */}
+      <Modal
+        animationType="slide"
+        transparent={true}
+        visible={modalVisible}
+        onRequestClose={() => {
+          setModalVisible(false);
+          setSelectedState(null);
+        }}
+      >
+        <Pressable
+          style={styles.modalOverlay}
+          onPress={() => {
+            setModalVisible(false);
+            setSelectedState(null);
+          }}
+        >
+          <View style={styles.modalContent}>
+            {/* Indicador de deslizamiento */}
+            <View style={styles.modalHandle} />
+
+            {/* Encabezado del modal */}
+            <View style={styles.modalHeader}>
+              <PoppinsText weight="medium" style={styles.modalTitle}>
+                Sucursales en el estado seleccionado
+              </PoppinsText>
+            </View>
+
+            {/* Contenido del modal */}
+            <FlatList
+              data={branches}
+              keyExtractor={(item) => item.id}
+              renderItem={({ item }) => (
+                <BranchCard
+                  branch={item}
+                  onPress={() => {
+                    console.log(
+                      'Navigating to branch detail with ID:',
+                      item.id,
+                    );
+                    router.push(`/branchDetail/${item.id}`);
+                  }}
+                />
+              )}
+              contentContainerStyle={styles.list}
+              ListEmptyComponent={
+                !loading ? (
+                  <PoppinsText style={styles.emptyText}>
+                    No hay sucursales disponibles.
+                  </PoppinsText>
+                ) : null
+              }
+            />
+          </View>
+        </Pressable>
+      </Modal>
     </View>
   );
 }
@@ -14,8 +141,65 @@ export default function BranchesScreen() {
 const styles = StyleSheet.create({
   container: {
     flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
     backgroundColor: Colors.bgColor,
+    padding: 16,
+    paddingTop: -16,
+  },
+  title: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 4,
+  },
+  list: {
+    marginTop: 8,
+  },
+  stateCard: {
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 16,
+    marginBottom: 10,
+    shadowColor: '#000',
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  stateName: {
+    fontSize: FontSizes.s2.size,
+    lineHeight: FontSizes.s2.lineHeight,
+    color: Colors.textMain,
+  },
+  emptyText: {
+    textAlign: 'center',
+    color: Colors.textLowContrast,
+    marginTop: 20,
+  },
+  modalOverlay: {
+    flex: 1,
+    backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    justifyContent: 'flex-end',
+  },
+  modalContent: {
+    backgroundColor: Colors.bgColor,
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    padding: 16,
+    maxHeight: '80%',
+  },
+  modalHandle: {
+    width: 40,
+    height: 4,
+    backgroundColor: Colors.textLowContrast,
+    borderRadius: 2,
+    alignSelf: 'center',
+    marginBottom: 16,
+  },
+  modalHeader: {
+    marginBottom: 8,
+  },
+  modalTitle: {
+    fontSize: FontSizes.s1.size,
+    lineHeight: FontSizes.s1.lineHeight,
+    color: Colors.textMain,
   },
 });
diff --git a/src/services/branches.ts b/src/services/branches.ts
index f88749f..4200ea9 100644
--- a/src/services/branches.ts
+++ b/src/services/branches.ts
@@ -1,6 +1,7 @@
 import { api } from '../lib/sdkConfig';
 import { Pagination, BranchResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
+import * as SecureStore from 'expo-secure-store';
 
 type FindAllParams = {
   page?: number;
@@ -18,11 +19,25 @@ export const BranchService = {
   }: FindAllParams): Promise<Pagination<BranchResponse>> => {
     try {
       const response = await api.branch.findAll({ page, limit, q, stateId });
-
       return response;
     } catch (error) {
       console.error('Error en BranchService.findAll:', error);
       throw new Error(extractErrorMessage(error));
     }
   },
+
+  getById: async (id: string): Promise<BranchResponse> => {
+    if (!id || typeof id !== 'string') {
+      throw new Error('El ID proporcionado no es válido.');
+    }
+
+    try {
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      const response = await api.branch.getById(id, jwt || '');
+      return response;
+    } catch (error) {
+      console.error('Error en BranchService.getById:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };
diff --git a/src/services/inventory.ts b/src/services/inventory.ts
index fb9406d..b3733b8 100644
--- a/src/services/inventory.ts
+++ b/src/services/inventory.ts
@@ -1,7 +1,14 @@
 import { api } from '../lib/sdkConfig';
-import { ServiceResponse, Pagination, Inventory } from '../types/api.d';
+import { ServiceResponse, Inventory } from '../types/api.d';
+import { Pagination, InventoryResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
+type GetBranchInventoryParams = {
+  page?: number;
+  limit?: number;
+  branchId: string;
+};
+
 export const InventoryService = {
   getPresentationInventory: async (
     page: number,
@@ -23,4 +30,18 @@ export const InventoryService = {
       };
     }
   },
+
+  getBranchInventory: async ({
+    page = 1,
+    limit = 10,
+    branchId,
+  }: GetBranchInventoryParams): Promise<Pagination<InventoryResponse>> => {
+    try {
+      const response = await api.inventory.findAll({ page, limit, branchId });
+      return response;
+    } catch (error) {
+      console.error('Error en InventoryService.getBranchInventory:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };
diff --git a/src/services/state.ts b/src/services/state.ts
index 9f1d7c7..7d26dc7 100644
--- a/src/services/state.ts
+++ b/src/services/state.ts
@@ -1,17 +1,16 @@
 import { api } from '../lib/sdkConfig';
-import {
-  ServiceResponse,
-  Pagination,
-  State,
-  CityResponse,
-} from '../types/api.d';
+import { Pagination, StateResponse, CityResponse } from '@pharmatech/sdk';
 import { extractErrorMessage } from '../utils/errorHandler';
 
 export const StateService = {
   getStates: async (
     page: number,
     limit: number,
-  ): Promise<ServiceResponse<Pagination<State>>> => {
+  ): Promise<{
+    success: boolean;
+    data?: Pagination<StateResponse>;
+    error?: string;
+  }> => {
     try {
       const states = await api.state.findAll({
         page: page,
@@ -27,7 +26,9 @@ export const StateService = {
     }
   },
 
-  getState: async (id: string): Promise<ServiceResponse<State>> => {
+  getState: async (
+    id: string,
+  ): Promise<{ success: boolean; data?: StateResponse; error?: string }> => {
     try {
       const state = await api.state.getById(id);
       return { success: true, data: state };
@@ -43,7 +44,11 @@ export const StateService = {
     page: number,
     limit: number,
     stateId: string,
-  ): Promise<ServiceResponse<Pagination<CityResponse>>> => {
+  ): Promise<{
+    success: boolean;
+    data?: Pagination<CityResponse>;
+    error?: string;
+  }> => {
     try {
       const cities = await api.city.findAll({
         page: page,
@@ -60,7 +65,9 @@ export const StateService = {
     }
   },
 
-  getCity: async (id: string): Promise<ServiceResponse<CityResponse>> => {
+  getCity: async (
+    id: string,
+  ): Promise<{ success: boolean; data?: CityResponse; error?: string }> => {
     try {
       const city = await api.city.getById(id);
       return { success: true, data: city };
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 7ef6548..22a60be 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -33,14 +33,14 @@ export const Colors = {
 
   yellow: '#FFBA2E0',
 
-  primary_600: '#415FCF',
-
   gray_100: '#E7E7E6',
   gray_500: '#6E6D6C',
 
   secondary_300: '#8BEAB3',
 
   primary_300: '#A2BEEE',
+  primary_400: '#769CE4',
+  primary_600: '#415FCF',
   primary_700: '#374CBE',
 };
 

From bb3ce689f32b2b6ffdbc07acdb959f5ec22dd07e Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 5 May 2025 18:25:43 -0400
Subject: [PATCH 197/291] Style fixes to branch details

---
 src/screens/BranchDetailScreen.tsx | 51 ++++++++++++++++++++++--------
 1 file changed, 37 insertions(+), 14 deletions(-)

diff --git a/src/screens/BranchDetailScreen.tsx b/src/screens/BranchDetailScreen.tsx
index 7252344..f9b2a87 100644
--- a/src/screens/BranchDetailScreen.tsx
+++ b/src/screens/BranchDetailScreen.tsx
@@ -8,13 +8,14 @@ import {
 } from 'react-native';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { BranchService } from '../services/branches';
-import { ProductService } from '../services/products'; // Importar el servicio de productos
-import { InventoryService } from '../services/inventory'; // Importar el servicio de inventario
+import { ProductService } from '../services/products';
+import { InventoryService } from '../services/inventory';
 import { BranchResponse, ProductPresentation } from '@pharmatech/sdk';
 import BranchMapModal from '../components/BranchMapModal';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { usePagination } from '../hooks/usePagination';
+import { MapPinIcon } from 'react-native-heroicons/solid';
 
 export default function BranchDetailScreen() {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -123,14 +124,14 @@ export default function BranchDetailScreen() {
       {branch ? (
         <>
           <PoppinsText style={styles.title}>{branch.name}</PoppinsText>
+          <PoppinsText style={styles.titleAddress}>Dirección</PoppinsText>
           <PoppinsText style={styles.address}>{branch.address}</PoppinsText>
           <TouchableOpacity
-            style={styles.mapButton}
             onPress={() => setMapVisible(true)}
+            style={styles.mapButton}
           >
-            <PoppinsText style={styles.mapButtonText}>
-              Ver en el mapa
-            </PoppinsText>
+            <MapPinIcon size={22} color={Colors.primary} />
+            <PoppinsText style={styles.map}>Ubicar en el mapa</PoppinsText>
           </TouchableOpacity>
         </>
       ) : (
@@ -138,6 +139,10 @@ export default function BranchDetailScreen() {
           No se pudo cargar la información de la sucursal.
         </PoppinsText>
       )}
+      <View style={styles.divider} />
+      <PoppinsText style={styles.titleAddress}>
+        Productos disponibles en {branch?.name || 'la sucursal'}
+      </PoppinsText>
       <FlatList
         data={products}
         keyExtractor={(item) => item.id}
@@ -173,22 +178,40 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
     padding: 16,
+    paddingTop: 52,
   },
   title: {
-    fontSize: FontSizes.h4.size,
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
     color: Colors.textMain,
-    marginBottom: 10,
+    marginBottom: 8,
+  },
+  titleAddress: {
+    fontSize: FontSizes.s2.size,
+    lineHeight: FontSizes.s2.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
   },
   address: {
-    fontSize: FontSizes.b2.size,
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
     color: Colors.textLowContrast,
-    marginBottom: 20,
+    marginBottom: 12,
+  },
+  map: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
   },
   mapButton: {
-    backgroundColor: Colors.primary,
-    padding: 10,
-    borderRadius: 8,
-    marginBottom: 20,
+    flexDirection: 'row',
+    marginBottom: 8,
+  },
+  divider: {
+    marginBottom: 8,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.stroke,
   },
   mapButtonText: {
     color: Colors.textWhite,

From a5ece9e4581b3f3221fe8e3401676966a6e792ae Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 5 May 2025 19:26:59 -0400
Subject: [PATCH 198/291] Fixing quantity and modal in branches

---
 src/screens/BranchDetailScreen.tsx | 51 +++++++++---------------------
 src/screens/tab/BranchesScreen.tsx | 50 +++++++++++++++++++++--------
 2 files changed, 51 insertions(+), 50 deletions(-)

diff --git a/src/screens/BranchDetailScreen.tsx b/src/screens/BranchDetailScreen.tsx
index f9b2a87..1e96e00 100644
--- a/src/screens/BranchDetailScreen.tsx
+++ b/src/screens/BranchDetailScreen.tsx
@@ -9,7 +9,6 @@ import {
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { BranchService } from '../services/branches';
 import { ProductService } from '../services/products';
-import { InventoryService } from '../services/inventory';
 import { BranchResponse, ProductPresentation } from '@pharmatech/sdk';
 import BranchMapModal from '../components/BranchMapModal';
 import { Colors, FontSizes } from '../styles/theme';
@@ -29,36 +28,20 @@ export default function BranchDetailScreen() {
     fetchData,
     loading,
     hasMore,
-  } = usePagination<ProductPresentation & { stockQuantity: number }>(
-    async (page) => {
-      const [productResponse, inventoryResponse] = await Promise.all([
-        ProductService.getProducts(page, 10, { branchId: [id!] }),
-        InventoryService.getBranchInventory({ page, limit: 10, branchId: id! }),
-      ]);
+  } = usePagination<ProductPresentation>(async (page) => {
+    const productResponse = await ProductService.getProducts(page, 10, {
+      branchId: [id!],
+    });
 
-      if (!productResponse.success || !inventoryResponse) {
-        return { data: [], next: null };
-      }
-
-      // Map inventory stockQuantity to products
-      const inventoryMap = new Map(
-        inventoryResponse.results.map((item) => [
-          item.productPresentation.id,
-          item.stockQuantity,
-        ]),
-      );
-
-      const productsWithStock = productResponse.data.results.map((product) => ({
-        ...product,
-        stockQuantity: inventoryMap.get(product.id) || 0, // Default to 0 if not found
-      }));
+    if (!productResponse.success) {
+      return { data: [], next: null };
+    }
 
-      return {
-        data: productsWithStock,
-        next: productResponse.data.next,
-      };
-    },
-  );
+    return {
+      data: productResponse.data.results,
+      next: productResponse.data.next,
+    };
+  });
 
   useEffect(() => {
     if (!id) {
@@ -78,12 +61,8 @@ export default function BranchDetailScreen() {
     fetchBranchDetails();
   }, [id]);
 
-  const renderProduct = ({
-    item,
-  }: {
-    item: ProductPresentation & { stockQuantity: number };
-  }) => {
-    const { product, presentation, stockQuantity } = item;
+  const renderProduct = ({ item }: { item: ProductPresentation }) => {
+    const { product, presentation, stock } = item;
 
     return (
       <TouchableOpacity
@@ -104,7 +83,7 @@ export default function BranchDetailScreen() {
             {presentation.quantity} {presentation.measurementUnit}
           </PoppinsText>
           <PoppinsText style={styles.productQuantity}>
-            Cantidad disponible en sucursal: {stockQuantity}
+            Cantidad disponible en sucursal: {stock}
           </PoppinsText>
         </View>
       </TouchableOpacity>
diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index a4ab2cf..f74e03d 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -7,6 +7,7 @@ import {
   Modal,
   Pressable,
 } from 'react-native';
+import { useFocusEffect } from '@react-navigation/native';
 import { StateService } from '../../services/state';
 import { BranchService } from '../../services/branches';
 import { StateResponse, BranchResponse } from '@pharmatech/sdk';
@@ -49,6 +50,14 @@ export default function BranchesScreen() {
     }
   }, [selectedState]);
 
+  // Restablecer el estado del modal y el estado seleccionado al volver a la pantalla
+  useFocusEffect(
+    React.useCallback(() => {
+      setModalVisible(false); // Cerramos el modal
+      setSelectedState(null); // Restablecemos el estado seleccionado
+    }, []),
+  );
+
   return (
     <View style={styles.container}>
       <PoppinsText weight="medium" style={styles.title}>
@@ -80,7 +89,7 @@ export default function BranchesScreen() {
 
       {/* Modal para mostrar las sucursales */}
       <Modal
-        animationType="slide"
+        animationType="none"
         transparent={true}
         visible={modalVisible}
         onRequestClose={() => {
@@ -88,13 +97,18 @@ export default function BranchesScreen() {
           setSelectedState(null);
         }}
       >
-        <Pressable
-          style={styles.modalOverlay}
-          onPress={() => {
-            setModalVisible(false);
-            setSelectedState(null);
-          }}
-        >
+        {/* Overlay fijo */}
+        <View style={styles.modalOverlay} />
+
+        {/* Contenido del modal */}
+        <View style={styles.modalContainer}>
+          <Pressable
+            style={styles.modalDismissArea}
+            onPress={() => {
+              setModalVisible(false);
+              setSelectedState(null);
+            }}
+          />
           <View style={styles.modalContent}>
             {/* Indicador de deslizamiento */}
             <View style={styles.modalHandle} />
@@ -114,10 +128,6 @@ export default function BranchesScreen() {
                 <BranchCard
                   branch={item}
                   onPress={() => {
-                    console.log(
-                      'Navigating to branch detail with ID:',
-                      item.id,
-                    );
                     router.push(`/branchDetail/${item.id}`);
                   }}
                 />
@@ -132,7 +142,7 @@ export default function BranchesScreen() {
               }
             />
           </View>
-        </Pressable>
+        </View>
       </Modal>
     </View>
   );
@@ -175,9 +185,21 @@ const styles = StyleSheet.create({
     marginTop: 20,
   },
   modalOverlay: {
-    flex: 1,
+    position: 'absolute',
+    top: 0,
+    left: 0,
+    right: 0,
+    bottom: 0,
     backgroundColor: 'rgba(0, 0, 0, 0.5)',
+    zIndex: 1,
+  },
+  modalContainer: {
+    flex: 1,
     justifyContent: 'flex-end',
+    zIndex: 2,
+  },
+  modalDismissArea: {
+    flex: 1,
   },
   modalContent: {
     backgroundColor: Colors.bgColor,

From 617cf52b96ed6e4a512030079bea95b4f633e2c2 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 5 May 2025 20:05:57 -0400
Subject: [PATCH 199/291] Adding recommendations to homescreen

---
 src/screens/tab/HomeScreen.tsx | 84 +++++++++++++++++++++++++++++++---
 src/services/products.ts       | 15 ++++++
 2 files changed, 92 insertions(+), 7 deletions(-)

diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index cab93c6..d7caf12 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,6 +1,6 @@
 import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
-import { useRouter, useLocalSearchParams } from 'expo-router'; // Importamos useLocalSearchParams
+import { useRouter, useLocalSearchParams } from 'expo-router';
 import * as SecureStore from 'expo-secure-store';
 import { useCart } from '../../hooks/useCart';
 import PoppinsText from '../../components/PoppinsText';
@@ -13,7 +13,9 @@ import { decodeJWT } from '../../helper/jwtHelper';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState<Product[]>([]);
+  const [recommendedProducts, setRecommendedProducts] = useState<Product[]>([]);
   const [loading, setLoading] = useState(true);
+  const [loadingRecommendations, setLoadingRecommendations] = useState(true);
   const [showEmailVerification, setShowEmailVerification] = useState(false);
   const router = useRouter();
   const { showEmailVerification: showEmailVerificationParam } =
@@ -27,7 +29,7 @@ export default function HomeScreen() {
 
   useEffect(() => {
     const initialize = async () => {
-      setLoading(true); // Asegúrate de que loading sea true al inicio
+      setLoading(true);
       const token = await SecureStore.getItemAsync('auth_token');
       if (!token) {
         router.replace('/login');
@@ -38,12 +40,13 @@ export default function HomeScreen() {
         }
       }
 
-      await obtainProducts(); // Espera a que los productos se carguen
-      setLoading(false); // Cambia loading a false solo después de que todo termine
+      await obtainProducts();
+      await obtainRecommendedProducts();
+      setLoading(false);
     };
 
     initialize();
-  }, []); // Elimina `cartItems` de las dependencias
+  }, []);
 
   useEffect(() => {
     if (showEmailVerificationParam) {
@@ -55,7 +58,7 @@ export default function HomeScreen() {
   }, [showEmailVerificationParam]);
 
   const obtainProducts = async () => {
-    setLoading(true); // Inicia el indicador de carga
+    setLoading(true);
     try {
       const productsData = await ProductService.getProducts(1, 20);
       if (productsData.success) {
@@ -105,7 +108,57 @@ export default function HomeScreen() {
     } catch (error) {
       console.error('Error fetching products:', error);
     } finally {
-      setLoading(false); // Finaliza el indicador de carga
+      setLoading(false);
+    }
+  };
+
+  const obtainRecommendedProducts = async () => {
+    setLoadingRecommendations(true);
+    try {
+      const recommendations = await ProductService.getRecommendations();
+      const carouselRecommendations = recommendations.results.map((p) => ({
+        id: p.id,
+        presentationId: p.presentation.id,
+        productId: p.product.id,
+        imageUrl: p.product.images[0].url,
+        name:
+          p.product.name +
+          ' ' +
+          p.presentation.name +
+          ' ' +
+          p.presentation.quantity +
+          ' ' +
+          p.presentation.measurementUnit,
+        category: p.product.categories[0]?.name || 'Sin categoría',
+        originalPrice: p.price,
+        discount: 10,
+        finalPrice: p.price - p.price * 0.1,
+        quantity: getItemQuantity(p.id),
+        getQuantity: (quantity: number) => {
+          addToCart({
+            id: p.id,
+            name:
+              p.product.name +
+              ' ' +
+              p.presentation.name +
+              ' ' +
+              p.presentation.quantity +
+              ' ' +
+              p.presentation.measurementUnit,
+            price: p.price,
+            quantity,
+            image:
+              p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
+          });
+          updateCartQuantity(p.id, quantity);
+        },
+      }));
+
+      setRecommendedProducts(carouselRecommendations);
+    } catch (error) {
+      console.error('Error fetching recommended products:', error);
+    } finally {
+      setLoadingRecommendations(false);
     }
   };
 
@@ -146,6 +199,23 @@ export default function HomeScreen() {
             )}
           </View>
         </View>
+        <View>
+          <PoppinsText weight="medium" style={styles.title}>
+            Recomendados para ti
+          </PoppinsText>
+          <View style={styles.rowFullWidth}>
+            {loadingRecommendations ? (
+              <View style={styles.loadingContainer}>
+                <PoppinsText style={styles.loadingText}>
+                  Cargando recomendaciones...
+                </PoppinsText>
+                <ActivityIndicator size="large" color={Colors.primary} />
+              </View>
+            ) : (
+              <Carousel cards={recommendedProducts} />
+            )}
+          </View>
+        </View>
       </ScrollView>
       <EmailVerificationModal
         visible={showEmailVerification}
diff --git a/src/services/products.ts b/src/services/products.ts
index 1be151c..6cb98e8 100644
--- a/src/services/products.ts
+++ b/src/services/products.ts
@@ -138,4 +138,19 @@ export const ProductService = {
       };
     }
   },
+
+  getRecommendations: async (): Promise<Pagination<ProductPresentation>> => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      const recommendations = await api.product.getRecommendations(token);
+      return recommendations;
+    } catch (error) {
+      console.error('Error en ProductService.getRecommendations:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };

From 991988c689035f887d6042de3bce49460911ea9c Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Mon, 5 May 2025 22:45:56 -0400
Subject: [PATCH 200/291] Added orderTracking screen

---
 src/app/order/tracking/[id].tsx     |   2 +
 src/app/order/tracking/_layout.tsx  |  12 +
 src/screens/ActiveOrdersScreen.tsx  |  54 +++-
 src/screens/OrderTrackingScreen.tsx | 367 ++++++++++++++++++++++++++++
 src/utils/commons.ts                |  13 +-
 5 files changed, 446 insertions(+), 2 deletions(-)
 create mode 100644 src/app/order/tracking/[id].tsx
 create mode 100644 src/app/order/tracking/_layout.tsx
 create mode 100644 src/screens/OrderTrackingScreen.tsx

diff --git a/src/app/order/tracking/[id].tsx b/src/app/order/tracking/[id].tsx
new file mode 100644
index 0000000..6d95284
--- /dev/null
+++ b/src/app/order/tracking/[id].tsx
@@ -0,0 +1,2 @@
+import OrderTrackingScreen from '../../../screens/OrderTrackingScreen';
+export default OrderTrackingScreen;
diff --git a/src/app/order/tracking/_layout.tsx b/src/app/order/tracking/_layout.tsx
new file mode 100644
index 0000000..c0f43ee
--- /dev/null
+++ b/src/app/order/tracking/_layout.tsx
@@ -0,0 +1,12 @@
+import React from 'react';
+import { Stack } from 'expo-router';
+
+export default function OrdersTrackingLayout() {
+  return (
+    <Stack
+      screenOptions={{
+        headerShown: false,
+      }}
+    />
+  );
+}
diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index c8940d1..27cb9af 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -60,6 +60,58 @@ const ActiveOrdersScreen = () => {
     fetchActiveOrders();
   }, []);
 
+  /* useEffect(() => {
+
+    function handleOrderStatus(order: OrderDetailedResponse) {
+      const status = order.status.toUpperCase();
+
+      if (status === 'CANCELED') {
+        router.replace('/checkout/rejected');
+        return;
+      }
+
+      if (status === 'COMPLETED') {
+        clearCart();
+        setOrderId('');
+        router.replace('/');
+        return;
+      }
+
+      // Para PENDING, definimos qué pasos permitimos
+      const instant =
+        (deliveryMethod === 'store' && paymentMethod === 'pos') ||
+        (deliveryMethod === 'home' && paymentMethod === 'cash');
+
+      // Siempre permitimos reviewOrder y deliveryInfo
+      const allowed = ['revieworder', 'deliveryinfo'];
+      // Si NO es instant (es decir, requiere paso de pago), añadimos paymentprocess
+      if (!instant) {
+        allowed.push('paymentprocess');
+      }
+
+      if (!allowed.includes(lowerStep)) {
+        router.replace('/checkout/revieworder');
+      }
+    }
+
+    const ws = new WebSocket('');
+
+    ws.onopen = () => {
+      setIsConnected(true);
+        console.log('Connected to socket: ', isConnected);
+        ws.onmessage = (e) => {
+          handleOrderStatus(order);
+        };
+    }
+
+    ws.onclose = () => {
+      setIsConnected(false);
+      console.log('Disconnected from socket: ', isConnected);
+    };
+
+    
+  },[]) */
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -146,7 +198,7 @@ const ActiveOrdersScreen = () => {
                     {STATUS_LABELS[order.status] || order.status}
                   </PoppinsText>
                   <TouchableOpacity
-                    onPress={() => router.push(`order/${order.id}`)}
+                    onPress={() => router.push(`order/tracking/${order.id}`)}
                   >
                     <PoppinsText style={{ fontSize: FontSizes.c1.size }}>
                       Ver detalles
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
new file mode 100644
index 0000000..bbdf5a0
--- /dev/null
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -0,0 +1,367 @@
+import React, { useEffect, useState } from 'react';
+import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { useLocalSearchParams } from 'expo-router';
+import Alert from '../components/Alerts';
+import { OrderDetailedResponse } from '@pharmatech/sdk';
+import { UserService } from '../services/user';
+import { formatDate, truncateString } from '../utils/commons';
+import {
+  CubeIcon,
+  PhoneIcon,
+  TruckIcon,
+  UserIcon,
+} from 'react-native-heroicons/outline';
+import {
+  BuildingStorefrontIcon,
+  MapPinIcon,
+} from 'react-native-heroicons/solid';
+
+const OrderTrackingScreen = () => {
+  const { id } = useLocalSearchParams<{ id: string }>();
+
+  const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
+    undefined,
+  );
+  const [loading, setLoading] = useState(true);
+  const [showErrorAlert, setShowErrorAlert] = useState(false);
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const [errorMessage, setErrorMessage] = useState('');
+
+  useEffect(() => {
+    const fetchOrder = async () => {
+      try {
+        const order = await UserService.getOrder(id);
+
+        if (order.success) {
+          setOrder(order.data);
+        }
+      } catch (error) {
+        console.log(error);
+        setErrorMessage('Ocurrió un error');
+        setShowErrorAlert(true);
+      } finally {
+        setLoading(false);
+      }
+    };
+
+    fetchOrder();
+  }, []);
+
+  if (loading) {
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
+
+  /* useEffect(() => {
+ 
+		function handleOrderStatus(order: OrderDetailedResponse) {
+			const status = order.status.toUpperCase();
+ 
+			if (status === 'CANCELED') {
+				router.replace('/checkout/rejected');
+				return;
+			}
+ 
+			if (status === 'COMPLETED') {
+				clearCart();
+				setOrderId('');
+				router.replace('/');
+				return;
+			}
+ 
+			// Para PENDING, definimos qué pasos permitimos
+			const instant =
+				(deliveryMethod === 'store' && paymentMethod === 'pos') ||
+				(deliveryMethod === 'home' && paymentMethod === 'cash');
+ 
+			// Siempre permitimos reviewOrder y deliveryInfo
+			const allowed = ['revieworder', 'deliveryinfo'];
+			// Si NO es instant (es decir, requiere paso de pago), añadimos paymentprocess
+			if (!instant) {
+				allowed.push('paymentprocess');
+			}
+ 
+			if (!allowed.includes(lowerStep)) {
+				router.replace('/checkout/revieworder');
+			}
+		}
+ 
+		const ws = new WebSocket('');
+ 
+		ws.onopen = () => {
+			setIsConnected(true);
+				console.log('Connected to socket: ', isConnected);
+				ws.onmessage = (e) => {
+					handleOrderStatus(order);
+				};
+		}
+ 
+		ws.onclose = () => {
+			setIsConnected(false);
+			console.log('Disconnected from socket: ', isConnected);
+		};
+ 
+	  
+	},[]) */
+
+  return (
+    <ScrollView contentContainerStyle={styles.container}>
+      <View style={styles.alertContainer}>
+        {showErrorAlert && (
+          <Alert
+            type="error"
+            title="Error"
+            message={errorMessage}
+            onClose={() => setShowErrorAlert(false)}
+            borderColor
+          />
+        )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Pedido agregado al carrito"
+            onClose={() => {
+              setShowSuccessAlert(false);
+            }}
+            borderColor
+          />
+        )}
+      </View>
+      <View style={styles.orderHeader}>
+        <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
+          Seguimiento del Pedido
+        </PoppinsText>
+      </View>
+      {order && order.orderDeliveries && (
+        <View style={styles.orderInfo}>
+          <View>
+            <PoppinsText weight="medium">
+              Orden ID: #{truncateString(order?.id, 8, '')}
+            </PoppinsText>
+            <PoppinsText>
+              Fecha del pedido: {formatDate(order?.createdAt)}
+            </PoppinsText>
+          </View>
+          <View
+            style={{
+              marginVertical: 10,
+              flexDirection: 'row',
+              paddingVertical: 5,
+            }}
+          >
+            {order?.type === 'delivery' ? (
+              <>
+                <TruckIcon color={Colors.semanticSuccess} />
+                <PoppinsText style={{ color: Colors.semanticSuccess }}>
+                  Entrega estimada:{' '}
+                  {new Date(
+                    order?.orderDeliveries[0].estimatedTime,
+                  ).toLocaleString('es-ES', {
+                    day: '2-digit',
+                    month: 'long',
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true,
+                  })}
+                </PoppinsText>
+              </>
+            ) : (
+              <>
+                <CubeIcon color={Colors.semanticSuccess} />
+                <PoppinsText style={{ color: Colors.semanticSuccess }}>
+                  Pickup:{' '}
+                  {new Date(
+                    order?.orderDeliveries[0].estimatedTime,
+                  ).toLocaleString('es-ES', {
+                    day: '2-digit',
+                    month: 'long',
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true,
+                  })}
+                </PoppinsText>
+              </>
+            )}
+          </View>
+          <View style={{ marginVertical: 20 }}>
+            <View>
+              <PoppinsText>Orden Confirmada</PoppinsText>
+              <PoppinsText
+                style={{
+                  color: Colors.secondaryGray,
+                  fontSize: FontSizes.c3.size,
+                }}
+              >
+                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
+                  'es-ES',
+                  {
+                    day: '2-digit',
+                    month: 'long',
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true,
+                  },
+                )}
+              </PoppinsText>
+            </View>
+            <View style={{ marginVertical: 20 }}>
+              <PoppinsText>Orden Confirmada</PoppinsText>
+              <PoppinsText
+                style={{
+                  color: Colors.secondaryGray,
+                  fontSize: FontSizes.c3.size,
+                }}
+              >
+                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
+                  'es-ES',
+                  {
+                    day: '2-digit',
+                    month: 'long',
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true,
+                  },
+                )}
+              </PoppinsText>
+            </View>
+            <View>
+              <PoppinsText>Orden Confirmada</PoppinsText>
+              <PoppinsText
+                style={{
+                  color: Colors.secondaryGray,
+                  fontSize: FontSizes.c3.size,
+                }}
+              >
+                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
+                  'es-ES',
+                  {
+                    day: '2-digit',
+                    month: 'long',
+                    hour: '2-digit',
+                    minute: '2-digit',
+                    hour12: true,
+                  },
+                )}
+              </PoppinsText>
+            </View>
+          </View>
+          <View>
+            <View
+              style={{
+                backgroundColor: Colors.textWhite,
+                borderWidth: 1,
+                borderColor: Colors.gray_100,
+                borderRadius: 5,
+              }}
+            >
+              {order?.type === 'pickup' ? (
+                <View style={{ flexDirection: 'row', padding: 20 }}>
+                  <View style={{ marginRight: 10 }}>
+                    <BuildingStorefrontIcon color={Colors.primary} />
+                  </View>
+                  <View>
+                    <PoppinsText>Dirección de Sucursal:</PoppinsText>
+                    <PoppinsText style={{ marginVertical: 10 }}>
+                      {order?.branch?.name}
+                    </PoppinsText>
+                    <PoppinsText>{order?.branch?.address}.</PoppinsText>
+                    <PoppinsText>{order?.branch?.city.name}</PoppinsText>
+                  </View>
+                </View>
+              ) : (
+                <>
+                  <View style={{ flexDirection: 'row', padding: 20 }}>
+                    <View style={{ marginRight: 10 }}>
+                      <MapPinIcon color={Colors.primary} />
+                    </View>
+                    <View>
+                      <PoppinsText style={{ marginBottom: 10 }}>
+                        Dirección de Entrega:
+                      </PoppinsText>
+                      <PoppinsText>{order?.branch?.address}.</PoppinsText>
+                      <PoppinsText>{order?.branch?.city.name}</PoppinsText>
+                    </View>
+                  </View>
+                  <View
+                    style={{
+                      flexDirection: 'row',
+                      borderTopWidth: 1,
+                      borderBottomWidth: 1,
+                      borderColor: Colors.gray_100,
+                      padding: 20,
+                    }}
+                  >
+                    <View style={{ marginRight: 10 }}>
+                      <UserIcon color={Colors.primary} />
+                    </View>
+                    <View>
+                      <PoppinsText style={{ marginBottom: 10 }}>
+                        Nombre del Repartidor:
+                      </PoppinsText>
+                      <PoppinsText>
+                        {order?.orderDeliveries[0].employee?.firstName}{' '}
+                        {order?.orderDeliveries[0].employee?.lastName}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                  <View style={{ flexDirection: 'row', padding: 20 }}>
+                    <View style={{ marginRight: 10 }}>
+                      <PhoneIcon color={Colors.primary} />
+                    </View>
+                    <View>
+                      <PoppinsText style={{ marginBottom: 10 }}>
+                        Teléfono de Contacto:
+                      </PoppinsText>
+                      <PoppinsText>
+                        +{order?.orderDeliveries[0].employee?.phoneNumber}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                </>
+              )}
+            </View>
+          </View>
+        </View>
+      )}
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    flexGrow: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 20,
+  },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -162,
+    top: 20,
+    right: 0,
+    zIndex: 1000,
+  },
+  orderHeader: {
+    alignItems: 'center',
+    marginTop: 30,
+    marginBottom: 15,
+  },
+  orderInfo: {
+    marginVertical: 5,
+  },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.bgColor,
+  },
+});
+
+export default OrderTrackingScreen;
diff --git a/src/utils/commons.ts b/src/utils/commons.ts
index abde565..a221224 100644
--- a/src/utils/commons.ts
+++ b/src/utils/commons.ts
@@ -1,11 +1,22 @@
 export const truncateString = (
   text: string,
   maxLength: number = 27,
+  lastSeparator: string = '...',
 ): string => {
   if (text) {
     if (text.length > maxLength) {
-      return text.substring(0, maxLength) + '...';
+      return text.substring(0, maxLength) + lastSeparator;
     }
   }
   return text;
 };
+
+export const formatDate = (date: string): string => {
+  const options: Intl.DateTimeFormatOptions = {
+    year: 'numeric',
+    month: 'long',
+    day: '2-digit',
+  };
+  const dateObj = new Date(date);
+  return dateObj.toLocaleDateString('es-ES', options);
+};

From 253c096b93341f9b167e940bf2a757526baf29e7 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Mon, 5 May 2025 23:53:10 -0400
Subject: [PATCH 201/291] Implement websocket

---
 src/screens/OrderTrackingScreen.tsx | 82 ++++++++++-------------------
 1 file changed, 28 insertions(+), 54 deletions(-)

diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index bbdf5a0..8965826 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -28,6 +28,7 @@ const OrderTrackingScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const [isConnected, setIsConnected] = useState(false);
 
   useEffect(() => {
     const fetchOrder = async () => {
@@ -57,57 +58,22 @@ const OrderTrackingScreen = () => {
     );
   }
 
-  /* useEffect(() => {
- 
-		function handleOrderStatus(order: OrderDetailedResponse) {
-			const status = order.status.toUpperCase();
- 
-			if (status === 'CANCELED') {
-				router.replace('/checkout/rejected');
-				return;
-			}
- 
-			if (status === 'COMPLETED') {
-				clearCart();
-				setOrderId('');
-				router.replace('/');
-				return;
-			}
- 
-			// Para PENDING, definimos qué pasos permitimos
-			const instant =
-				(deliveryMethod === 'store' && paymentMethod === 'pos') ||
-				(deliveryMethod === 'home' && paymentMethod === 'cash');
- 
-			// Siempre permitimos reviewOrder y deliveryInfo
-			const allowed = ['revieworder', 'deliveryinfo'];
-			// Si NO es instant (es decir, requiere paso de pago), añadimos paymentprocess
-			if (!instant) {
-				allowed.push('paymentprocess');
-			}
- 
-			if (!allowed.includes(lowerStep)) {
-				router.replace('/checkout/revieworder');
-			}
-		}
- 
-		const ws = new WebSocket('');
- 
-		ws.onopen = () => {
-			setIsConnected(true);
-				console.log('Connected to socket: ', isConnected);
-				ws.onmessage = (e) => {
-					handleOrderStatus(order);
-				};
-		}
- 
-		ws.onclose = () => {
-			setIsConnected(false);
-			console.log('Disconnected from socket: ', isConnected);
-		};
- 
-	  
-	},[]) */
+  const handleDeliveryStatus = () => {};
+
+  const ws = new WebSocket('');
+
+  ws.onopen = () => {
+    setIsConnected(true);
+    console.log('Connected to socket: ', isConnected);
+    ws.onmessage = () => {
+      handleDeliveryStatus();
+    };
+  };
+
+  ws.onclose = () => {
+    setIsConnected(false);
+    console.log('Disconnected from socket: ', isConnected);
+  };
 
   return (
     <ScrollView contentContainerStyle={styles.container}>
@@ -210,8 +176,12 @@ const OrderTrackingScreen = () => {
                 )}
               </PoppinsText>
             </View>
-            <View style={{ marginVertical: 20 }}>
-              <PoppinsText>Orden Confirmada</PoppinsText>
+            <View style={{ marginVertical: 15 }}>
+              <PoppinsText>
+                {order.type === 'delivery'
+                  ? 'Repartidor en camino'
+                  : 'En preparación'}
+              </PoppinsText>
               <PoppinsText
                 style={{
                   color: Colors.secondaryGray,
@@ -231,7 +201,11 @@ const OrderTrackingScreen = () => {
               </PoppinsText>
             </View>
             <View>
-              <PoppinsText>Orden Confirmada</PoppinsText>
+              <PoppinsText>
+                {order.type === 'delivery'
+                  ? 'Pedido entregado'
+                  : 'Listo para recoger'}
+              </PoppinsText>
               <PoppinsText
                 style={{
                   color: Colors.secondaryGray,

From 7abe595ee57e5124476635447dbd12aa4de28ab7 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 6 May 2025 00:10:17 -0400
Subject: [PATCH 202/291] Make map buttom dependent of state and inventor,
 changed title margin

---
 src/screens/ProductDetailScreen.tsx | 74 ++++++++++++++++-------------
 1 file changed, 41 insertions(+), 33 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 36ca316..d3a60a0 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -411,38 +411,6 @@ const ProductDetailScreen: React.FC = () => {
             >
               Disponibilidad en sucursales
             </PoppinsText>
-            <View style={styles.quantitySelector}>
-              {showMap ? (
-                <View style={{ flex: 1, height: 300 }}>
-                  {inventory && inventory.length > 0 ? (
-                    <BranchMap
-                      branches={inventory.map((inv) => ({
-                        id: inv.branch.id,
-                        name: inv.branch.name,
-                        address: inv.branch.address,
-                        latitude: inv.branch.latitude,
-                        longitude: inv.branch.longitude,
-                        stockQuantity: inv.stockQuantity,
-                      }))}
-                    />
-                  ) : (
-                    <PoppinsText
-                      style={{
-                        textAlign: 'center',
-                        color: Colors.textLowContrast,
-                        marginVertical: 10,
-                      }}
-                    >
-                      No hay productos disponibles
-                    </PoppinsText>
-                  )}
-                </View>
-              ) : (
-                <View style={{ flex: 1 }}>
-                  <Button title="Ver Mapa" onPress={() => setShowMap(true)} />
-                </View>
-              )}
-            </View>
             <PoppinsText style={styles.sectionTitle}>
               Selecciona el estado
             </PoppinsText>
@@ -523,6 +491,46 @@ const ProductDetailScreen: React.FC = () => {
                 </PoppinsText>
               )}
             </View>
+            <View style={styles.quantitySelector}>
+              {showMap ? (
+                <View style={{ flex: 1, height: 300 }}>
+                  {inventory && inventory.length > 0 ? (
+                    <BranchMap
+                      branches={inventory.map((inv) => ({
+                        id: inv.branch.id,
+                        name: inv.branch.name,
+                        address: inv.branch.address,
+                        latitude: inv.branch.latitude,
+                        longitude: inv.branch.longitude,
+                        stockQuantity: inv.stockQuantity,
+                      }))}
+                    />
+                  ) : (
+                    <PoppinsText
+                      style={{
+                        textAlign: 'center',
+                        color: Colors.textLowContrast,
+                        marginVertical: 10,
+                      }}
+                    >
+                      No hay productos disponibles
+                    </PoppinsText>
+                  )}
+                </View>
+              ) : (
+                <View style={{ flex: 1, marginVertical: 10 }}>
+                  <Button
+                    title="Ver Mapa"
+                    onPress={() => setShowMap(true)}
+                    variant={
+                      selectedState && inventory.length > 0
+                        ? 'primary'
+                        : 'disabled'
+                    }
+                  />
+                </View>
+              )}
+            </View>
             <PoppinsText style={styles.sectionTitle}>
               Productos relacionados
             </PoppinsText>
@@ -593,7 +601,7 @@ const styles = StyleSheet.create({
     textAlign: 'center',
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
-    marginVertical: 15,
+    margin: 20,
   },
   description: {
     fontSize: FontSizes.b3.size,

From 63a64b5bd217c430141171cd2ee5aeb754776d2b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 6 May 2025 00:36:49 -0400
Subject: [PATCH 203/291] Handle reorder in OrderDetail screen

---
 src/screens/OrderDetailScreen.tsx | 69 ++++++++++++++-----------------
 src/screens/OrdersScreen.tsx      | 18 ++++++++
 src/utils/commons.ts              |  3 +-
 3 files changed, 52 insertions(+), 38 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 8588a94..cfb5575 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -16,6 +16,7 @@ import { UserService } from '../services/user';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { OrderDetailedResponse } from '@pharmatech/sdk';
 import { truncateString } from '../utils/commons';
+import { useCart } from '../hooks/useCart';
 
 const OrderDetailScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -27,8 +28,31 @@ const OrderDetailScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const { addToCart, getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
 
+  const handleReorder = () => {
+    order?.details.forEach((detail) => {
+      const existingQuantity = getItemQuantity(detail.productPresentation.id);
+      if (existingQuantity > 0) {
+        updateCartQuantity(
+          detail.productPresentation.id,
+          existingQuantity + detail.quantity,
+        );
+      } else {
+        addToCart({
+          id: detail.productPresentation.id,
+          quantity: detail.quantity,
+          price: detail.subtotal,
+          name: detail.productPresentation.product.name,
+          image: detail.productPresentation.product.images[0].url,
+        });
+      }
+    });
+    setShowSuccessAlert(true);
+    router.push('/cart');
+  };
+
   useEffect(() => {
     const fetchOrder = async () => {
       try {
@@ -101,17 +125,17 @@ const OrderDetailScreen = () => {
           <View>
             <PoppinsText>Número de pedido:</PoppinsText>
             <PoppinsText>
-              {order ? truncateString(order?.id, 8) : ''}
+              #{order ? truncateString(order?.id, 8, '') : ''}
             </PoppinsText>
           </View>
           <Button
-            title="Re ordenar"
+            title="Ver Tracking"
             size="small"
             style={{ paddingVertical: 0 }}
-            onPress={() => setShowSuccessAlert(true)}
+            onPress={() => router.push(`order/tracking/${order?.id}`)}
           />
         </View>
-        <ScrollView style={{ height: 400 }}>
+        <ScrollView style={{ height: 380 }}>
           {order?.details.map((detail, index) => (
             <View
               key={index}
@@ -197,6 +221,9 @@ const OrderDetailScreen = () => {
             <PoppinsText>${order?.totalPrice}</PoppinsText>
           </View>
         </View>
+        <View style={{ marginTop: 20 }}>
+          <Button title="Re Ordenar" onPress={handleReorder} />
+        </View>
       </View>
     </ScrollView>
   );
@@ -207,6 +234,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingBottom: 0,
   },
   alertContainer: {
     position: 'absolute',
@@ -236,42 +264,9 @@ const styles = StyleSheet.create({
     borderWidth: 2,
     borderColor: '#e0e0e0',
   },
-  editButton: {
-    paddingVertical: 10,
-    paddingHorizontal: 20,
-    borderRadius: 20,
-  },
-  editButtonText: {
-    color: Colors.primary,
-  },
   orderInfo: {
     marginBottom: 20,
   },
-  fieldContainer: {
-    marginBottom: 15,
-  },
-  fieldLabel: {
-    fontSize: 14,
-    color: '#666',
-    marginBottom: 5,
-  },
-  fieldValue: {
-    fontSize: 18,
-    color: '#333',
-    marginBottom: 10,
-  },
-  separator: {
-    height: 1,
-    backgroundColor: '#e0e0e0',
-    marginBottom: 15,
-  },
-  bottomEditButton: {
-    alignSelf: 'center',
-    marginTop: 20,
-    marginBottom: 40,
-    width: '50%',
-    alignItems: 'center',
-  },
 });
 
 export default OrderDetailScreen;
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 1c38f19..e167535 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -26,6 +26,24 @@ const OrdersScreen = () => {
   const [errorMessage, setErrorMessage] = useState('');
   const router = useRouter();
 
+  /* const handleReorder = (order: OrderResponse) => {
+
+    order.products.forEach((product) => {
+      const existingQuantity = getItemQuantity(product.productId);
+      if (existingQuantity > 0) {
+        updateCartQuantity(product.productId, existingQuantity + product.quantity);
+      } else {
+        addToCart({
+          id: product.productId,
+          quantity: product.quantity,
+          price: product.price,
+          name: product.name,
+          image: product.image,
+        });
+      }
+    }
+  }; */
+
   useEffect(() => {
     const fetchOrders = async () => {
       try {
diff --git a/src/utils/commons.ts b/src/utils/commons.ts
index abde565..3d12465 100644
--- a/src/utils/commons.ts
+++ b/src/utils/commons.ts
@@ -1,10 +1,11 @@
 export const truncateString = (
   text: string,
   maxLength: number = 27,
+  optionalText: string = '...',
 ): string => {
   if (text) {
     if (text.length > maxLength) {
-      return text.substring(0, maxLength) + '...';
+      return text.substring(0, maxLength) + optionalText;
     }
   }
   return text;

From 2fea19b38c7d13f2a2b45291f22898dbdaf5e997 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 6 May 2025 00:45:58 -0400
Subject: [PATCH 204/291] Added reorder to orders screen

---
 src/screens/OrderDetailScreen.tsx |  4 +--
 src/screens/OrdersScreen.tsx      | 57 ++++++++++++++++++++++---------
 2 files changed, 42 insertions(+), 19 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index cfb5575..855f4d0 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -239,9 +239,9 @@ const styles = StyleSheet.create({
   alertContainer: {
     position: 'absolute',
     width: 326,
-    left: '50%',
+    left: '56%',
     marginLeft: -162,
-    top: 20,
+    top: 40,
     right: 0,
     zIndex: 1000,
   },
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index e167535..c81ce66 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -15,6 +15,7 @@ import { OrderResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
 import OrderBadge from '../components/OrderBadge';
+import { useCart } from '../hooks/useCart';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -24,25 +25,35 @@ const OrdersScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showInfoAlert, setShowInfoAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+  const [showSuccessAlert, setShowSuccessAlert] = useState(false);
+  const { addToCart, getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
 
-  /* const handleReorder = (order: OrderResponse) => {
+  const handleReorder = async (id: string) => {
+    const orderData = await UserService.getOrder(id);
 
-    order.products.forEach((product) => {
-      const existingQuantity = getItemQuantity(product.productId);
-      if (existingQuantity > 0) {
-        updateCartQuantity(product.productId, existingQuantity + product.quantity);
-      } else {
-        addToCart({
-          id: product.productId,
-          quantity: product.quantity,
-          price: product.price,
-          name: product.name,
-          image: product.image,
-        });
-      }
+    if (orderData.success) {
+      orderData.data.details.forEach((detail) => {
+        const existingQuantity = getItemQuantity(detail.productPresentation.id);
+        if (existingQuantity > 0) {
+          updateCartQuantity(
+            detail.productPresentation.id,
+            existingQuantity + detail.quantity,
+          );
+        } else {
+          addToCart({
+            id: detail.productPresentation.id,
+            quantity: detail.quantity,
+            price: detail.subtotal,
+            name: detail.productPresentation.product.name,
+            image: detail.productPresentation.product.images[0].url,
+          });
+        }
+      });
+      router.push('/cart');
     }
-  }; */
+    setShowSuccessAlert(true);
+  };
 
   useEffect(() => {
     const fetchOrders = async () => {
@@ -98,6 +109,17 @@ const OrdersScreen = () => {
             borderColor
           />
         )}
+        {showSuccessAlert && (
+          <Alert
+            type="success"
+            title="Éxito"
+            message="Pedido agregado al carrito"
+            onClose={() => {
+              setShowInfoAlert(false);
+            }}
+            borderColor
+          />
+        )}
       </View>
       <View style={styles.orderHeader}>
         <PoppinsText style={{ fontSize: FontSizes.s1.size }}>
@@ -159,6 +181,7 @@ const OrdersScreen = () => {
                     title="Re ordenar"
                     size="small"
                     style={{ paddingVertical: 0 }}
+                    onPress={() => handleReorder(order.id)}
                   />
                 </View>
               </View>
@@ -178,9 +201,9 @@ const styles = StyleSheet.create({
   alertContainer: {
     position: 'absolute',
     width: 326,
-    left: '50%',
+    left: '56%',
     marginLeft: -162,
-    top: 20,
+    top: 40,
     right: 0,
     zIndex: 1000,
   },

From d1553d2e9327f3ffce7b14d7b176ccd6aa0b6569 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 13:55:45 -0400
Subject: [PATCH 205/291] Fixing product quantity in product details

---
 src/hooks/useNotifications.ts       |  2 +-
 src/screens/ProductDetailScreen.tsx | 97 +++++++++++++++++------------
 2 files changed, 57 insertions(+), 42 deletions(-)

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index ecc0429..127bb31 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -67,7 +67,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   useEffect(() => {
     const interval = setInterval(() => {
       void refreshNotifications();
-    }, 10_000); // ajusta intervalo según necesidad
+    }, 30_000); // ajusta intervalo según necesidad
 
     return () => clearInterval(interval);
   }, [refreshNotifications]);
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index a3387ec..f30a051 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -28,7 +28,7 @@ import { ProductService } from '../services/products';
 import { TruckIcon } from 'react-native-heroicons/outline';
 import Carousel from '../components/Carousel';
 import { StateService } from '../services/state';
-import { Inventory, State } from '../types/api';
+import { State } from '../types/api';
 import { InventoryService } from '../services/inventory';
 import { useNavigation } from '@react-navigation/native';
 import BranchMap from '../components/BranchMap';
@@ -36,6 +36,7 @@ import {
   ProductImage,
   ProductPresentationDetailResponse,
   ProductPresentationResponse,
+  InventoryResponse,
 } from '@pharmatech/sdk';
 import Button from '../components/Button';
 import { BranchService } from '../services/branches';
@@ -48,7 +49,7 @@ const ProductDetailScreen: React.FC = () => {
   const navigation = useNavigation(); // Obtén la instancia de navegación
 
   const [showMap, setShowMap] = useState(false);
-  const [inventory, setInventory] = useState<Inventory[]>([]);
+  const [inventory, setInventory] = useState<InventoryResponse[]>([]);
   const [states, setStates] = useState<State[]>([]);
   const [selectedState, setSelectedState] = useState('');
   const [product, setProduct] = useState<ProductPresentationDetailResponse>();
@@ -176,53 +177,67 @@ const ProductDetailScreen: React.FC = () => {
   }, []);
 
   useEffect(() => {
-    const fetchInventory = async () => {
-      if (!selectedState) return;
-      if (product) {
-        const inventoryData = await InventoryService.getPresentationInventory(
-          1,
-          20,
-          product.id || '',
-        );
-        if (inventoryData.success) {
-          const newInventory = inventoryData.data.results.map((inv) => ({
-            id: inv.id,
-            branch: {
-              id: inv.branch.id,
-              name: inv.branch.name,
-              address: inv.branch.address,
-              latitude: inv.branch.latitude,
-              longitude: inv.branch.longitude,
-            },
-            stockQuantity: inv.stockQuantity,
-          }));
-
-          const stateBranches = await BranchService.findAll({
+    const loadBranchesWithStock = async () => {
+      if (!selectedState || !product) return;
+
+      setInventory([]); // Limpiar el estado antes de cargar nuevos datos
+
+      try {
+        // Obtener las sucursales del estado seleccionado
+        const branchesRes = await BranchService.findAll({
+          page: 1,
+          limit: 100,
+          stateId: selectedState,
+        });
+
+        const results: InventoryResponse[] = [];
+
+        for (const branch of branchesRes.results) {
+          // Obtener el inventario de la sucursal para la presentación del producto
+          const inventoryRes = await InventoryService.getBranchInventory({
+            branchId: branch.id,
             page: 1,
-            limit: 20,
-            stateId: selectedState,
+            limit: 100,
           });
 
-          const commonBranches = newInventory.filter((inv) =>
-            stateBranches.results.find((branch) => branch.id === inv.branch.id),
+          // Validar que inventoryRes.results sea un array
+          if (!Array.isArray(inventoryRes.results)) {
+            console.error(
+              'inventoryRes.results no es un array:',
+              inventoryRes.results,
+            );
+            continue;
+          }
+
+          // Validar que product esté definido
+          if (!product || !product.id) {
+            console.error(
+              'El producto no está definido o no tiene un ID:',
+              product,
+            );
+            continue;
+          }
+
+          // Buscar el inventario que coincida con la presentación del producto
+          const match = inventoryRes.results.find(
+            (inv) =>
+              inv.productPresentation &&
+              inv.productPresentation.id === product.id,
           );
 
-          setInventory((prevInventory) => {
-            const updatedInventory: Inventory[] = [];
-            commonBranches.forEach((newItem) => {
-              if (!prevInventory.some((item) => item.id === newItem.id)) {
-                updatedInventory.push(newItem as Inventory);
-              }
-            });
-            return updatedInventory;
-          });
-        } else {
-          console.error(inventoryData.error);
+          if (match && match.stockQuantity > 0) {
+            results.push(match); // Agregar directamente el objeto InventoryResponse
+          }
         }
+
+        setInventory(results); // Actualizar el estado con los datos obtenidos
+      } catch (error) {
+        console.error('Error cargando sucursales con stock:', error);
       }
     };
-    fetchInventory();
-  }, [selectedState]);
+
+    loadBranchesWithStock();
+  }, [selectedState, product]);
 
   const handleScroll = (event: NativeSyntheticEvent<NativeScrollEvent>) => {
     const contentOffsetX = event.nativeEvent.contentOffset.x;

From 748853dbf55afb319b765dafebc71194f6a24a89 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 14:18:12 -0400
Subject: [PATCH 206/291] Stylizing a bit product details

---
 src/screens/ProductDetailScreen.tsx | 218 +++++++++++++++-------------
 1 file changed, 121 insertions(+), 97 deletions(-)

diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index f30a051..9685514 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -60,6 +60,7 @@ const ProductDetailScreen: React.FC = () => {
   const [userRating, setUserRating] = useState<number>(0);
   const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
+  const [isLoadingInventory, setIsLoadingInventory] = useState(false);
   const imagesScrollRef = useRef<ScrollView>(null);
   const discount = 10;
   const router = useRouter();
@@ -181,6 +182,7 @@ const ProductDetailScreen: React.FC = () => {
       if (!selectedState || !product) return;
 
       setInventory([]); // Limpiar el estado antes de cargar nuevos datos
+      setIsLoadingInventory(true); // Mostrar el indicador de carga
 
       try {
         // Obtener las sucursales del estado seleccionado
@@ -233,6 +235,8 @@ const ProductDetailScreen: React.FC = () => {
         setInventory(results); // Actualizar el estado con los datos obtenidos
       } catch (error) {
         console.error('Error cargando sucursales con stock:', error);
+      } finally {
+        setIsLoadingInventory(false); // Ocultar el indicador de carga
       }
     };
 
@@ -384,7 +388,16 @@ const ProductDetailScreen: React.FC = () => {
                 <PoppinsText style={styles.discount}>-{discount}%</PoppinsText>
               )}
             </View>
-            <PoppinsText style={styles.sectionTitle}>
+            <PoppinsText
+              style={[
+                styles.sectionTitle,
+                {
+                  fontSize: FontSizes.s1.size,
+                  paddingTop: 12,
+                  color: Colors.primary,
+                },
+              ]}
+            >
               Selecciona la presentación
             </PoppinsText>
             <View style={styles.quantitySelector}>
@@ -421,13 +434,13 @@ const ProductDetailScreen: React.FC = () => {
             <PoppinsText
               style={[
                 styles.sectionTitle,
-                { fontSize: FontSizes.s1.size, paddingTop: 15 },
+                { fontSize: FontSizes.s1.size, color: Colors.primary },
               ]}
             >
               Disponibilidad en sucursales
             </PoppinsText>
             <PoppinsText style={styles.sectionTitle}>
-              Selecciona el estado
+              Selecciona un estado para ver disponibilidad
             </PoppinsText>
             <View style={styles.quantitySelector}>
               <Dropdown
@@ -438,115 +451,126 @@ const ProductDetailScreen: React.FC = () => {
               />
             </View>
             <View style={styles.availableContainer}>
-              {inventory && inventory.length > 0 ? (
-                inventory.map((inv) => (
-                  <View key={inv.id} style={styles.availableCard}>
-                    <View style={{ padding: 10, paddingHorizontal: 16 }}>
-                      <PoppinsText style={styles.sectionTitle}>
-                        {inv.branch.name}
-                      </PoppinsText>
-                      <PoppinsText
-                        style={{
-                          fontSize: FontSizes.b3.size,
-                          color: Colors.textLowContrast,
-                        }}
-                      >
-                        {inv.branch.address}
-                      </PoppinsText>
-                    </View>
-                    <View
-                      style={{
-                        width: '100%',
-                        alignItems: 'flex-end',
-                        paddingHorizontal: 20,
-                      }}
-                    >
-                      <View
-                        style={{ flexDirection: 'row', alignItems: 'center' }}
-                      >
+              {selectedState ? (
+                isLoadingInventory ? (
+                  <ActivityIndicator size="large" color={Colors.primary} />
+                ) : inventory && inventory.length > 0 ? (
+                  inventory.map((inv) => (
+                    <View key={inv.id} style={styles.availableCard}>
+                      <View style={{ padding: 10, paddingHorizontal: 16 }}>
+                        <PoppinsText style={styles.sectionTitle}>
+                          {inv.branch.name}
+                        </PoppinsText>
                         <PoppinsText
                           style={{
-                            fontSize: FontSizes.c1.size,
+                            fontSize: FontSizes.b3.size,
                             color: Colors.textLowContrast,
                           }}
                         >
-                          {inv.stockQuantity} unidades{' '}
+                          {inv.branch.address}
                         </PoppinsText>
-                        <CheckCircleIcon
-                          size={15}
-                          color={Colors.semanticSuccess}
-                        />
                       </View>
                       <View
-                        style={{ flexDirection: 'row', alignItems: 'center' }}
+                        style={{
+                          width: '100%',
+                          alignItems: 'flex-end',
+                          paddingHorizontal: 20,
+                        }}
                       >
-                        <TruckIcon size={15} color={Colors.gray_500} />
-                        <PoppinsText
-                          style={{
-                            fontSize: FontSizes.c3.size,
-                            color: Colors.gray_500,
-                            marginLeft: 5,
-                          }}
+                        <View
+                          style={{ flexDirection: 'row', alignItems: 'center' }}
                         >
-                          Envio en menos de 3h
-                        </PoppinsText>
+                          <PoppinsText
+                            style={{
+                              fontSize: FontSizes.c1.size,
+                              color: Colors.textLowContrast,
+                            }}
+                          >
+                            {inv.stockQuantity} unidades{' '}
+                          </PoppinsText>
+                          <CheckCircleIcon
+                            size={15}
+                            color={Colors.semanticSuccess}
+                          />
+                        </View>
+                        <View
+                          style={{ flexDirection: 'row', alignItems: 'center' }}
+                        >
+                          <TruckIcon size={15} color={Colors.gray_500} />
+                          <PoppinsText
+                            style={{
+                              fontSize: FontSizes.c3.size,
+                              color: Colors.gray_500,
+                              marginLeft: 5,
+                            }}
+                          >
+                            Envio en menos de 3h
+                          </PoppinsText>
+                        </View>
                       </View>
                     </View>
-                  </View>
-                ))
-              ) : (
-                <PoppinsText
-                  style={{
-                    textAlign: 'center',
-                    color: Colors.textLowContrast,
-                    marginVertical: 10,
-                  }}
-                >
-                  No hay productos disponibles
-                </PoppinsText>
-              )}
+                  ))
+                ) : (
+                  <PoppinsText
+                    style={{
+                      textAlign: 'center',
+                      color: Colors.textLowContrast,
+                      marginVertical: 10,
+                    }}
+                  >
+                    No hay productos disponibles
+                  </PoppinsText>
+                )
+              ) : null}
             </View>
             <View style={styles.quantitySelector}>
-              {showMap ? (
-                <View style={{ flex: 1, height: 300 }}>
-                  {inventory && inventory.length > 0 ? (
-                    <BranchMap
-                      branches={inventory.map((inv) => ({
-                        id: inv.branch.id,
-                        name: inv.branch.name,
-                        address: inv.branch.address,
-                        latitude: inv.branch.latitude,
-                        longitude: inv.branch.longitude,
-                        stockQuantity: inv.stockQuantity,
-                      }))}
+              {selectedState ? (
+                showMap ? (
+                  <View style={{ flex: 1, height: 300 }}>
+                    {inventory && inventory.length > 0 ? (
+                      <BranchMap
+                        branches={inventory.map((inv) => ({
+                          id: inv.branch.id,
+                          name: inv.branch.name,
+                          address: inv.branch.address,
+                          latitude: inv.branch.latitude,
+                          longitude: inv.branch.longitude,
+                          stockQuantity: inv.stockQuantity,
+                        }))}
+                      />
+                    ) : (
+                      <PoppinsText
+                        style={{
+                          textAlign: 'center',
+                          color: Colors.textLowContrast,
+                          marginVertical: 10,
+                        }}
+                      >
+                        No hay productos disponibles
+                      </PoppinsText>
+                    )}
+                  </View>
+                ) : (
+                  <View style={{ flex: 1, marginVertical: 10 }}>
+                    <Button
+                      title="Ver Mapa"
+                      onPress={() => setShowMap(true)}
+                      variant={
+                        selectedState && inventory.length > 0
+                          ? 'primary'
+                          : 'disabled'
+                      }
                     />
-                  ) : (
-                    <PoppinsText
-                      style={{
-                        textAlign: 'center',
-                        color: Colors.textLowContrast,
-                        marginVertical: 10,
-                      }}
-                    >
-                      No hay productos disponibles
-                    </PoppinsText>
-                  )}
-                </View>
-              ) : (
-                <View style={{ flex: 1, marginVertical: 10 }}>
-                  <Button
-                    title="Ver Mapa"
-                    onPress={() => setShowMap(true)}
-                    variant={
-                      selectedState && inventory.length > 0
-                        ? 'primary'
-                        : 'disabled'
-                    }
-                  />
-                </View>
-              )}
+                  </View>
+                )
+              ) : null}
             </View>
-            <PoppinsText style={styles.sectionTitle}>
+            <PoppinsText
+              style={[
+                styles.sectionTitle,
+                { fontSize: FontSizes.s1.size, color: Colors.textMain },
+              ]}
+            >
               Productos relacionados
             </PoppinsText>
             <View style={styles.quantitySelector}>
@@ -632,7 +656,7 @@ const styles = StyleSheet.create({
   },
   quantitySelector: {
     flexDirection: 'row',
-    marginBottom: 15,
+    marginBottom: 8,
   },
   ratingStarsContainer: {
     flexDirection: 'row',

From 01598e60ce42e2162450679be32980bfffa082ce Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 14:31:30 -0400
Subject: [PATCH 207/291] Small fix in commons.ts

---
 src/utils/commons.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/utils/commons.ts b/src/utils/commons.ts
index 3d12465..a91a108 100644
--- a/src/utils/commons.ts
+++ b/src/utils/commons.ts
@@ -1,7 +1,7 @@
 export const truncateString = (
   text: string,
   maxLength: number = 27,
-  optionalText: string = '...',
+  optionalText: string = '',
 ): string => {
   if (text) {
     if (text.length > maxLength) {

From 431030f40500c5bcd1958dbc77f8be74a0b315c6 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 18:23:57 -0400
Subject: [PATCH 208/291] Eliminating IVA

---
 src/screens/CartListScreen.tsx    | 9 +--------
 src/screens/CheckoutScreen.tsx    | 9 +++------
 src/screens/OrderDetailScreen.tsx | 4 ++--
 3 files changed, 6 insertions(+), 16 deletions(-)

diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index a8cf88e..a204aaf 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -27,8 +27,7 @@ const CartListScreen = () => {
     (sum, item) => sum + item.price * (item.quantity * 0.1), // 12% discount
     0,
   ); // Discount sum
-  const iva = (subtotal - totalDiscount) * 0.16; // 10% subtotal minus discount
-  const total = subtotal - totalDiscount + iva; // Subtotal, discount and IVA sum
+  const total = subtotal - totalDiscount; // Subtotal minus discount
 
   const renderItem = ({ item }: { item: CartItem }) => {
     const discount = 10; // Discount percentage
@@ -132,12 +131,6 @@ const CartListScreen = () => {
                 -${totalDiscount.toFixed(2)}
               </PoppinsText>
             </View>
-            <View style={styles.row}>
-              <PoppinsText style={styles.ivaText}>IVA</PoppinsText>
-              <PoppinsText style={styles.ivaText}>
-                ${iva.toFixed(2)}
-              </PoppinsText>
-            </View>
             <View style={styles.row}>
               <PoppinsText style={styles.totalText}>Total</PoppinsText>
               <PoppinsText style={styles.totalText}>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 9880be6..0c26f77 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -134,8 +134,7 @@ const CheckoutScreen = () => {
   const subtotalAfterCoupon = couponApplied
     ? subtotalAfterDiscount * (1 - couponDiscount / 100)
     : subtotalAfterDiscount;
-  const iva = subtotalAfterCoupon * 0.16;
-  const total = subtotalAfterCoupon + iva;
+  const total = subtotalAfterCoupon;
 
   const renderFooterMessage = () => {
     if (option === 'pickup' && payment === 'punto_de_venta') {
@@ -529,10 +528,8 @@ const CheckoutScreen = () => {
                 </>
               )}
               <View style={styles.totalRow}>
-                <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
-                <PoppinsText style={styles.descuentoAmount}>
-                  +${iva.toFixed(2)}
-                </PoppinsText>
+                {/* <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
+<PoppinsText style={styles.descuentoAmount}>+${iva.toFixed(2)}</PoppinsText> */}
               </View>
               <View style={styles.totalRow}>
                 <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 855f4d0..aa23665 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -211,8 +211,8 @@ const OrderDetailScreen = () => {
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
-            <PoppinsText>IVA</PoppinsText>
-            <PoppinsText>${order?.totalPrice}</PoppinsText>
+            {/* <PoppinsText>IVA</PoppinsText>
+<PoppinsText>${order?.totalPrice}</PoppinsText> */}
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}

From 4fefa173c67b501d40191f2e891f55c19138504b Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 19:12:12 -0400
Subject: [PATCH 209/291] Eliminating hardcoded discounts

---
 src/components/Card.tsx             | 11 +++++-----
 src/components/OrderSummary.tsx     | 28 ++++++++++++-------------
 src/screens/CartListScreen.tsx      | 32 +++++++++++++----------------
 src/screens/CheckoutScreen.tsx      |  8 +++++---
 src/screens/OrderDetailScreen.tsx   |  8 ++++----
 src/screens/ProductDetailScreen.tsx | 14 ++++++-------
 src/screens/SearchProductScreen.tsx |  6 +++---
 src/screens/tab/HomeScreen.tsx      | 12 +++++------
 src/types/Product.ts                |  4 ++--
 9 files changed, 61 insertions(+), 62 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 0406293..4c6a046 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -15,8 +15,8 @@ const ProductCard: React.FC<Product> = ({
   imageUrl,
   name,
   category,
-  originalPrice,
-  discount,
+  //originalPrice,
+  //discount,
   finalPrice,
   getQuantity,
 }) => {
@@ -66,18 +66,19 @@ const ProductCard: React.FC<Product> = ({
         </View>
         <View style={styles.description}>
           <PoppinsText style={styles.name}>{truncateString(name)}</PoppinsText>
+          {/** 
           {discount && (
             <View style={styles.priceContainer}>
               <PoppinsText style={styles.originalPrice}>
                 ${originalPrice}
               </PoppinsText>
-              <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
+              <PoppinsText style={styles.discount}>{discount}%</PoppinsText> // Comentado 
             </View>
-          )}
+          )}*/}
           <PoppinsText
             style={[
               styles.finalPrice,
-              !discount && { color: Colors.semanticInfo },
+              //!discount && { color: Colors.semanticInfo },
             ]}
           >
             ${finalPrice}
diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 791b4b5..978f236 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -14,25 +14,26 @@ const OrderSummary = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  const totalDiscount = cartItems.reduce(
-    (sum, item) => sum + item.price * (item.quantity * 0.1),
-    0,
-  );
+  // const totalDiscount = cartItems.reduce(
+  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
+  //   0,
+  // );
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    const discount = 10;
-    const discountedPrice = item.price * (1 - discount / 100);
-    const totalDiscountedPrice = discountedPrice * item.quantity;
+    // const discount = 10; // Comentado
+    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
+    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
     const totalOriginalPrice = item.price * item.quantity;
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
+          {/** 
           <View style={styles.discountBadge}>
             <PoppinsText style={styles.discountBadgeText}>
-              -{discount}%
+              -10%
             </PoppinsText>
-          </View>
+          </View>*/}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -43,12 +44,13 @@ const OrderSummary = () => {
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <PoppinsText style={styles.productTotalPrice}>
-              ${totalDiscountedPrice.toFixed(2)}
+              ${totalOriginalPrice.toFixed(2)}
             </PoppinsText>
           </View>
+          {/**
           <PoppinsText style={styles.productOriginalPrice}>
             ${totalOriginalPrice.toFixed(2)}
-          </PoppinsText>
+          </PoppinsText> */}
           <PoppinsText style={styles.productPrice}>
             (${item.price} c/u)
           </PoppinsText>
@@ -105,9 +107,7 @@ const OrderSummary = () => {
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
-              <PoppinsText style={styles.discountText}>
-                -${totalDiscount.toFixed(2)}
-              </PoppinsText>
+              <PoppinsText style={styles.discountText}>-$0.00</PoppinsText>
             </View>
           </View>
         </>
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index a204aaf..c2151aa 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -23,27 +23,27 @@ const CartListScreen = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   ); // Total price sum
-  const totalDiscount = cartItems.reduce(
-    (sum, item) => sum + item.price * (item.quantity * 0.1), // 12% discount
-    0,
-  ); // Discount sum
-  const total = subtotal - totalDiscount; // Subtotal minus discount
+  // const totalDiscount = cartItems.reduce(
+  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
+  //   0,
+  // ); // Discount sum
+  const total = subtotal; // Subtotal without discount
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    const discount = 10; // Discount percentage
-    const discountedPrice = item.price * (1 - discount / 100); // Unit price discount
-    const totalDiscountedPrice = discountedPrice * item.quantity; // Total price with discount
+    // const discount = 10; // Comentado
+    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
+    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
     const totalOriginalPrice = item.price * item.quantity; // Original total price
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
           {/* Discount badge */}
-          <View style={styles.discountBadge}>
+          {/* <View style={styles.discountBadge}>
             <PoppinsText style={styles.discountBadgeText}>
               -{discount}%
             </PoppinsText>
-          </View>
+          </View> */}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -54,14 +54,10 @@ const CartListScreen = () => {
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <PoppinsText style={styles.productTotalPrice}>
-              ${totalDiscountedPrice.toFixed(2)}
-              {/* Total price with discount */}
+              ${totalOriginalPrice.toFixed(2)}
+              {/* Original total price */}
             </PoppinsText>
           </View>
-          <PoppinsText style={styles.productOriginalPrice}>
-            ${totalOriginalPrice.toFixed(2)}
-            {/* Original total price */}
-          </PoppinsText>
           <PoppinsText style={styles.productPrice}>
             (${item.price} c/u)
           </PoppinsText>
@@ -125,12 +121,12 @@ const CartListScreen = () => {
                 ${subtotal.toFixed(2)}
               </PoppinsText>
             </View>
-            <View style={styles.row}>
+            {/* <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
               <PoppinsText style={styles.discountText}>
                 -${totalDiscount.toFixed(2)}
               </PoppinsText>
-            </View>
+            </View> */}
             <View style={styles.row}>
               <PoppinsText style={styles.totalText}>Total</PoppinsText>
               <PoppinsText style={styles.totalText}>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 0c26f77..fc2f671 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -126,11 +126,13 @@ const CheckoutScreen = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  const totalDiscount = cartItems.reduce(
+  {
+    /** const totalDiscount = cartItems.reduce(
     (sum, item) => sum + item.price * (item.quantity * 0.1),
     0,
-  );
-  const subtotalAfterDiscount = subtotal - totalDiscount;
+  );*/
+  }
+  const subtotalAfterDiscount = subtotal; // - totalDiscount;
   const subtotalAfterCoupon = couponApplied
     ? subtotalAfterDiscount * (1 - couponDiscount / 100)
     : subtotalAfterDiscount;
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index aa23665..2a4d39b 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -201,12 +201,12 @@ const OrderDetailScreen = () => {
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
-            <PoppinsText style={{ color: Colors.semanticSuccess }}>
+            {/*  <PoppinsText style={{ color: Colors.semanticSuccess }}>
               Descuentos
             </PoppinsText>
-            <PoppinsText style={{ color: Colors.semanticSuccess }}>
-              -${order?.totalPrice}
-            </PoppinsText>
+            <PoppinsText style={{ color: Colors.semanticSuccess }}> // Comentado */}
+            {/*   -${order?.totalPrice} */}
+            {/* </PoppinsText> */}
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 9685514..2a9eaf2 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -62,7 +62,7 @@ const ProductDetailScreen: React.FC = () => {
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
   const [isLoadingInventory, setIsLoadingInventory] = useState(false);
   const imagesScrollRef = useRef<ScrollView>(null);
-  const discount = 10;
+  //const discount = 10;
   const router = useRouter();
 
   const { cartItems, addToCart, getItemQuantity, updateCartQuantity } =
@@ -91,9 +91,9 @@ const ProductDetailScreen: React.FC = () => {
           ' ' +
           p.presentation.measurementUnit,
         category: p.product.categories[0].name,
-        originalPrice: p.price,
-        discount: 10,
-        finalPrice: p.price - p.price * 0.1,
+        //originalPrice: p.price,
+        //discount: 10,
+        finalPrice: p.price,
         quantity: getItemQuantity(p.product.id),
         getQuantity: (quantity: number) => {
           addToCart({
@@ -384,9 +384,9 @@ const ProductDetailScreen: React.FC = () => {
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
               <PoppinsText style={styles.price}>$ {product?.price}</PoppinsText>
-              {discount && (
-                <PoppinsText style={styles.discount}>-{discount}%</PoppinsText>
-              )}
+              {/* {discount && ( // Comentado */}
+              {/*   <PoppinsText style={styles.discount}>-{discount}%</PoppinsText> */}
+              {/* )} */}
             </View>
             <PoppinsText
               style={[
diff --git a/src/screens/SearchProductScreen.tsx b/src/screens/SearchProductScreen.tsx
index 0007391..5fc354b 100644
--- a/src/screens/SearchProductScreen.tsx
+++ b/src/screens/SearchProductScreen.tsx
@@ -144,9 +144,9 @@ export default function SearchProductScreen() {
       }
       category={item.product.categories[0]?.name}
       imageUrl={item.product.images[0]?.url}
-      originalPrice={item.price}
-      discount={10}
-      finalPrice={item.price * 0.1}
+      //originalPrice={item.price}
+      //discount={10}
+      finalPrice={item.price}
       quantity={10}
       getQuantity={() => console.log}
     />
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index d7caf12..ad91bf1 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -77,9 +77,9 @@ export default function HomeScreen() {
             ' ' +
             p.presentation.measurementUnit,
           category: p.product.categories[0].name,
-          originalPrice: p.price,
-          discount: 10,
-          finalPrice: p.price - p.price * 0.1,
+          //originalPrice: p.price,
+          //discount: 10,
+          finalPrice: p.price,
           quantity: getItemQuantity(p.id),
           getQuantity: (quantity: number) => {
             addToCart({
@@ -130,9 +130,9 @@ export default function HomeScreen() {
           ' ' +
           p.presentation.measurementUnit,
         category: p.product.categories[0]?.name || 'Sin categoría',
-        originalPrice: p.price,
-        discount: 10,
-        finalPrice: p.price - p.price * 0.1,
+        //originalPrice: p.price,
+        //discount: 10,
+        finalPrice: p.price,
         quantity: getItemQuantity(p.id),
         getQuantity: (quantity: number) => {
           addToCart({
diff --git a/src/types/Product.ts b/src/types/Product.ts
index de32429..b037903 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -5,8 +5,8 @@ export type Product = {
   imageUrl: string;
   name: string;
   category: string;
-  originalPrice: number;
-  discount: number;
+  //originalPrice: number;
+  //discount: number;
   finalPrice: number;
   quantity: number;
   getQuantity: (quantity: number) => void;

From 7ab067a78c5fddafdda493857bd92536862d9c4c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 6 May 2025 19:26:44 -0400
Subject: [PATCH 210/291] Fixing commons.ts and the way it worked in order
 screen

---
 src/screens/OrdersScreen.tsx | 2 +-
 src/utils/commons.ts         | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index c81ce66..d7dfa26 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -152,7 +152,7 @@ const OrdersScreen = () => {
                 >
                   <View>
                     <PoppinsText>
-                      #{order ? truncateString(order?.id, 8) : ''}
+                      #{order ? truncateString(order?.id, 8, '') : ''}
                     </PoppinsText>
                     <PoppinsText style={{ color: Colors.textLowContrast }}>
                       {new Date(order.createdAt).toLocaleDateString()}{' '}
diff --git a/src/utils/commons.ts b/src/utils/commons.ts
index a91a108..3d12465 100644
--- a/src/utils/commons.ts
+++ b/src/utils/commons.ts
@@ -1,7 +1,7 @@
 export const truncateString = (
   text: string,
   maxLength: number = 27,
-  optionalText: string = '',
+  optionalText: string = '...',
 ): string => {
   if (text) {
     if (text.length > maxLength) {

From ec424a2bfe44cca2592cd0af54220ff3aa5ff318 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Wed, 7 May 2025 00:04:08 -0400
Subject: [PATCH 211/291] Using websocket

---
 package-lock.json                   | 128 ++++++++++++++++++++++++++++
 package.json                        |   1 +
 src/lib/socketUrl.ts                |   5 ++
 src/screens/ActiveOrdersScreen.tsx  |  52 -----------
 src/screens/OrderTrackingScreen.tsx |  57 +++++++++----
 5 files changed, 175 insertions(+), 68 deletions(-)
 create mode 100644 src/lib/socketUrl.ts

diff --git a/package-lock.json b/package-lock.json
index 8f891dc..f4cd845 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -41,6 +41,7 @@
         "react-native-screens": "~4.4.0",
         "react-native-svg": "^15.11.2",
         "react-redux": "^9.2.0",
+        "socket.io-client": "^4.8.1",
         "tailwindcss": "^3.4.17"
       },
       "devDependencies": {
@@ -4599,6 +4600,11 @@
         "@sinonjs/commons": "^3.0.0"
       }
     },
+    "node_modules/@socket.io/component-emitter": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/@socket.io/component-emitter/-/component-emitter-3.1.2.tgz",
+      "integrity": "sha512-9BCxFwvbGg/RsZK9tjXd8s4UcwR0MWeFQ1XEKIQVVvAGJyINdrqKMcTRyLoK8Rse1GjzLV9cwjWV1olXRWEXVA=="
+    },
     "node_modules/@svgr/babel-plugin-add-jsx-attribute": {
       "version": "8.0.0",
       "resolved": "https://registry.npmjs.org/@svgr/babel-plugin-add-jsx-attribute/-/babel-plugin-add-jsx-attribute-8.0.0.tgz",
@@ -10449,6 +10455,62 @@
         "once": "^1.4.0"
       }
     },
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
+      }
+    },
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+      "engines": {
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
     "node_modules/enhanced-resolve": {
       "version": "5.18.1",
       "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
@@ -20967,6 +21029,64 @@
         "tslib": "^2.0.3"
       }
     },
+    "node_modules/socket.io-client": {
+      "version": "4.8.1",
+      "resolved": "https://registry.npmjs.org/socket.io-client/-/socket.io-client-4.8.1.tgz",
+      "integrity": "sha512-hJVXfu3E28NmzGk8o1sHhN3om52tRvwYeidbj7xKy2eIIse5IoKX3USlS6Tqt3BHAtflLIkCQBkzVrEEfWUyYQ==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.2",
+        "engine.io-client": "~6.6.1",
+        "socket.io-parser": "~4.2.4"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
+    "node_modules/socket.io-parser": {
+      "version": "4.2.4",
+      "resolved": "https://registry.npmjs.org/socket.io-parser/-/socket.io-parser-4.2.4.tgz",
+      "integrity": "sha512-/GbIKmo8ioc+NIWIhwdecY0ge+qVBSMdgxGygevmdHj24bsfgtCmcUUcQ5ZzcylGFHsN3k4HB4Cgkl96KVnuew==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1"
+      },
+      "engines": {
+        "node": ">=10.0.0"
+      }
+    },
+    "node_modules/socket.io-parser/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+      "dependencies": {
+        "ms": "^2.1.3"
+      },
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
+      }
+    },
     "node_modules/sockjs": {
       "version": "0.3.24",
       "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
@@ -23448,6 +23568,14 @@
       "resolved": "https://registry.npmjs.org/xmlchars/-/xmlchars-2.2.0.tgz",
       "integrity": "sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw=="
     },
+    "node_modules/xmlhttprequest-ssl": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/xmlhttprequest-ssl/-/xmlhttprequest-ssl-2.1.2.tgz",
+      "integrity": "sha512-TEU+nJVUUnA4CYJFLvK5X9AOeH4KvDvhIfm0vV1GaQRtchnG0hgK5p8hw/xjv8cunWYCsiPCSDzObPyhEwq3KQ==",
+      "engines": {
+        "node": ">=0.4.0"
+      }
+    },
     "node_modules/xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
diff --git a/package.json b/package.json
index fb61345..917b07e 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,7 @@
     "react-native-screens": "~4.4.0",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
+    "socket.io-client": "^4.8.1",
     "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
diff --git a/src/lib/socketUrl.ts b/src/lib/socketUrl.ts
new file mode 100644
index 0000000..65016c6
--- /dev/null
+++ b/src/lib/socketUrl.ts
@@ -0,0 +1,5 @@
+const devModeFlag = process.env.PHARMATECH_DEV_MODE === 'true';
+const devUrl = 'ws://api-dev-8jfx.onrender.com';
+const prodUrl = 'ws://api-d8h5.onrender.com';
+
+export const SOCKET_URL = devModeFlag ? devUrl : prodUrl;
diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 27cb9af..51bd3eb 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -60,58 +60,6 @@ const ActiveOrdersScreen = () => {
     fetchActiveOrders();
   }, []);
 
-  /* useEffect(() => {
-
-    function handleOrderStatus(order: OrderDetailedResponse) {
-      const status = order.status.toUpperCase();
-
-      if (status === 'CANCELED') {
-        router.replace('/checkout/rejected');
-        return;
-      }
-
-      if (status === 'COMPLETED') {
-        clearCart();
-        setOrderId('');
-        router.replace('/');
-        return;
-      }
-
-      // Para PENDING, definimos qué pasos permitimos
-      const instant =
-        (deliveryMethod === 'store' && paymentMethod === 'pos') ||
-        (deliveryMethod === 'home' && paymentMethod === 'cash');
-
-      // Siempre permitimos reviewOrder y deliveryInfo
-      const allowed = ['revieworder', 'deliveryinfo'];
-      // Si NO es instant (es decir, requiere paso de pago), añadimos paymentprocess
-      if (!instant) {
-        allowed.push('paymentprocess');
-      }
-
-      if (!allowed.includes(lowerStep)) {
-        router.replace('/checkout/revieworder');
-      }
-    }
-
-    const ws = new WebSocket('');
-
-    ws.onopen = () => {
-      setIsConnected(true);
-        console.log('Connected to socket: ', isConnected);
-        ws.onmessage = (e) => {
-          handleOrderStatus(order);
-        };
-    }
-
-    ws.onclose = () => {
-      setIsConnected(false);
-      console.log('Disconnected from socket: ', isConnected);
-    };
-
-    
-  },[]) */
-
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index 8965826..47333a6 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -7,6 +7,7 @@ import Alert from '../components/Alerts';
 import { OrderDetailedResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
+import * as SecureStore from 'expo-secure-store';
 import {
   CubeIcon,
   PhoneIcon,
@@ -17,6 +18,8 @@ import {
   BuildingStorefrontIcon,
   MapPinIcon,
 } from 'react-native-heroicons/solid';
+import io from 'socket.io-client';
+import { SOCKET_URL } from '../lib/socketUrl';
 
 const OrderTrackingScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -46,8 +49,43 @@ const OrderTrackingScreen = () => {
         setLoading(false);
       }
     };
-
     fetchOrder();
+
+    const socket = io(SOCKET_URL, {
+      transportOptions: {
+        polling: {
+          extraHeaders: {
+            authorization: `Bearer ${SecureStore.getItemAsync('auth_token')}`,
+          },
+        },
+      },
+    });
+
+    if (id) {
+      fetchOrder();
+      if (socket.connected) {
+        onConnect();
+      }
+
+      function onConnect() {
+        setIsConnected(true);
+        console.log('Connected to socket: ', isConnected);
+        socket.on('order', (order: OrderDetailedResponse) => {
+          handleDeliveryStatus(order);
+        });
+      }
+
+      function onDisconnect() {
+        setIsConnected(false);
+      }
+
+      socket.on('connect', onConnect);
+      socket.on('disconnect', onDisconnect);
+      return () => {
+        socket.off('connect', onConnect);
+        socket.off('disconnect', onDisconnect);
+      };
+    }
   }, []);
 
   if (loading) {
@@ -58,21 +96,8 @@ const OrderTrackingScreen = () => {
     );
   }
 
-  const handleDeliveryStatus = () => {};
-
-  const ws = new WebSocket('');
-
-  ws.onopen = () => {
-    setIsConnected(true);
-    console.log('Connected to socket: ', isConnected);
-    ws.onmessage = () => {
-      handleDeliveryStatus();
-    };
-  };
-
-  ws.onclose = () => {
-    setIsConnected(false);
-    console.log('Disconnected from socket: ', isConnected);
+  const handleDeliveryStatus = (e: OrderDetailedResponse) => {
+    console.log('Received message: ', e);
   };
 
   return (

From 8bfeee75af3296609ceac0df45a9acf51b99b9d1 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 14 May 2025 15:57:15 -0400
Subject: [PATCH 212/291] Fixes del sprint 5 para el checkout

---
 src/components/PaymentInfoForm.tsx      | 30 ++++++---
 src/components/PaymentStatusMessage.tsx | 87 +++++++++++++++++++------
 src/screens/CheckoutScreen.tsx          | 58 ++++++++++++-----
 src/services/order.ts                   | 14 ++++
 4 files changed, 141 insertions(+), 48 deletions(-)

diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index a0d9d53..2b20240 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -92,9 +92,12 @@ const PaymentInfoForm: React.FC<Props> = ({
       paymentMethod !== null &&
       (paymentMethod === 'pago_movil' || paymentMethod === 'transferencia')
         ? bank.trim() !== '' &&
-          /^\d+$/.test(reference) &&
+          /^\d{4,}$/.test(reference) &&
           reference.trim() !== '' &&
-          /^\d{1,8}$/.test(documentNumber) &&
+          !/^0+$/.test(reference) && // no solo ceros
+          /^\d{7,8}$/.test(documentNumber) &&
+          !/^0+$/.test(documentNumber) && // no solo ceros
+          !/^0/.test(documentNumber) && // no inicia en 0
           /^\d{11}$/.test(phone)
         : true;
 
@@ -208,9 +211,11 @@ const PaymentInfoForm: React.FC<Props> = ({
             placeholder="Ingrese la referencia"
             getValue={handleReferenceChange}
             fieldType="number"
-            errorText="Debe ser un número válido"
-            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
-            showIcon
+            errorText="Debe ser un número valido"
+            validation={(val) =>
+              /^\d{4,}$/.test(val) && val.trim() !== '' && !/^0+$/.test(val)
+            }
+            showIcon={reference.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
@@ -220,9 +225,14 @@ const PaymentInfoForm: React.FC<Props> = ({
             value={documentNumber}
             getValue={handleDocumentNumberChange}
             fieldType="number"
-            errorText="El campo no debe estar vacío"
-            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
-            showIcon
+            errorText="Debe ser un número de documento valido"
+            validation={(val) =>
+              /^\d{7,8}$/.test(val) &&
+              val.trim() !== '' &&
+              !/^0+$/.test(val) &&
+              !/^0/.test(val)
+            }
+            showIcon={documentNumber.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
@@ -233,8 +243,8 @@ const PaymentInfoForm: React.FC<Props> = ({
             getValue={handlePhoneChange}
             fieldType="number"
             errorText="Debe tener exactamente 11 dígitos"
-            validation={(val) => /^\d{11}$/.test(val)}
-            showIcon
+            validation={(val) => /^\d{11}$/.test(val) && !/^0+$/.test(val)}
+            showIcon={phone.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
diff --git a/src/components/PaymentStatusMessage.tsx b/src/components/PaymentStatusMessage.tsx
index 0446869..9cb0f57 100644
--- a/src/components/PaymentStatusMessage.tsx
+++ b/src/components/PaymentStatusMessage.tsx
@@ -1,44 +1,91 @@
 import React from 'react';
-import { CheckCircleIcon, XCircleIcon } from 'react-native-heroicons/outline';
+import {
+  CheckCircleIcon,
+  XCircleIcon,
+  ClockIcon,
+} from 'react-native-heroicons/outline';
 import theme from '../styles/theme';
 import { Text, View, StyleSheet } from 'react-native';
 
+type OrderStatus =
+  | 'requested'
+  | 'approved'
+  | 'ready_for_pickup'
+  | 'in_progress'
+  | 'rejected';
+
 interface PaymentStatusMessageProps {
-  status: 'approved' | 'rejected';
+  orderStatus: OrderStatus;
   orderNumber: string;
   userName: string;
 }
 
+const statusConfig: Record<
+  OrderStatus,
+  {
+    icon: React.ElementType;
+    color: string;
+    title: string;
+    message: (orderNumber: string, userName: string) => string;
+  }
+> = {
+  requested: {
+    icon: ClockIcon,
+    color: theme.Colors.semanticWarning,
+    title: 'Orden En Espera',
+    message: () =>
+      `Estamos procesando tu orden. En un momento actualizaremos el estado de tu orden  Si tienes alguna duda, por favor contacta a nuestro equipo de soporte.`,
+  },
+
+  approved: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Orden aprobada',
+    message: (_orderNumber, userName) =>
+      `¡Gracias por tu compra, ${userName}! Tu orden ha sido aprobada.`,
+  },
+  ready_for_pickup: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Lista para recoger',
+    message: () =>
+      'Tu pedido está listo para ser recogido en la sucursal seleccionada.',
+  },
+  in_progress: {
+    icon: ClockIcon,
+    color: theme.Colors.semanticWarning,
+    title: 'Orden En Espera',
+    message: () =>
+      'Tu pedido está en espera. Pronto comenzaremos a procesarlo.',
+  },
+  rejected: {
+    icon: XCircleIcon,
+    color: theme.Colors.semanticDanger,
+    title: 'Orden rechazada',
+    message: () =>
+      'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.',
+  },
+};
+
 const PaymentStatusMessage: React.FC<PaymentStatusMessageProps> = ({
-  status,
+  orderStatus,
   orderNumber,
   userName,
 }) => {
+  const config = statusConfig[orderStatus] || statusConfig['requested'];
+  const Icon = config.icon;
+
   return (
     <View style={styles.container}>
       <View style={styles.iconContainer}>
-        {status === 'approved' ? (
-          <CheckCircleIcon
-            width={30}
-            height={30}
-            color={theme.Colors.semanticSuccess}
-          />
-        ) : (
-          <XCircleIcon
-            width={30}
-            height={30}
-            color={theme.Colors.semanticDanger}
-          />
-        )}
+        <Icon width={30} height={30} color={config.color} />
       </View>
       <View style={styles.textContainer}>
         <Text style={[styles.title, { color: theme.Colors.textMain }]}>
-          Orden #{orderNumber}
+          {config.title} #{orderNumber}
         </Text>
         <Text style={[styles.message, { color: theme.Colors.textLowContrast }]}>
-          {status === 'approved'
-            ? `¡Gracias por tu compra, ${userName}!`
-            : 'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.'}
+          {config.message(orderNumber, userName)}
         </Text>
       </View>
     </View>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index fc2f671..fee4794 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -61,7 +61,6 @@ const CheckoutScreen = () => {
 
   const router = useRouter();
   const { cartItems } = useCart();
-  const [status, setStatus] = useState<'approved' | 'rejected'>('approved');
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
   const [userName, setUserName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
@@ -76,6 +75,7 @@ const CheckoutScreen = () => {
   const [validationPopupVisible, setValidationPopupVisible] = useState(false);
   const [emailVerificationModalVisible, setEmailVerificationModalVisible] =
     useState(false); // Track modal visibility
+  const [orderStatus, setOrderStatus] = useState<string | null>(null);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -187,19 +187,19 @@ const CheckoutScreen = () => {
       try {
         if (option === 'pickup' && !isValidUUID(locationId)) {
           setErrorMessage('La sucursal seleccionada no es válida.');
-          setStatus('rejected');
+          setOrderStatus(null);
           return;
         }
 
         if (option === 'delivery' && !isValidUUID(locationId)) {
           setErrorMessage('La dirección seleccionada no es válida.');
-          setStatus('rejected');
+          setOrderStatus(null);
           return;
         }
 
         if (!option) {
           setErrorMessage('Debe seleccionar una opción de compra.');
-          setStatus('rejected');
+          setOrderStatus(null);
           return;
         }
 
@@ -215,7 +215,7 @@ const CheckoutScreen = () => {
 
         if (products.length === 0) {
           setErrorMessage('No hay productos válidos en el carrito.');
-          setStatus('rejected');
+          setOrderStatus(null);
           return;
         }
 
@@ -246,21 +246,34 @@ const CheckoutScreen = () => {
           setErrorMessage(
             'No pudimos procesar tu orden. Inténtalo nuevamente.',
           );
-          setStatus('rejected');
+
+          setOrderStatus(null);
           return;
         }
 
         // Guardar el número de orden generado
         setOrderNumber(orderResponse.id);
 
+        // Obtener el status real de la orden desde el backend
+        try {
+          const orderDetail = await OrderService.getById(orderResponse.id);
+          setOrderStatus(orderDetail.status); // <-- status real del backend
+        } catch (err) {
+          console.error(
+            'No se pud          git checkout -b fix/sprint-5-checkout-fixeso obtener el status de la orden:',
+            err,
+          );
+          setOrderStatus(orderResponse.status ?? null);
+        }
+
         console.log('Orden creada exitosamente:', orderResponse);
 
-        setStatus('approved');
         dispatch(setStep(step + 1)); // Move to the confirmation step
       } catch (error) {
         console.error('Error al procesar la orden:', error);
         setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
-        setStatus('rejected');
+
+        setOrderStatus(null);
       }
     } else if (step === stepsLabels.length) {
       // Limpiar el carrito al salir del flujo de checkout
@@ -294,8 +307,8 @@ const CheckoutScreen = () => {
     }
   };
 
-  const renderConfirmationContent = (status: 'approved' | 'rejected') => {
-    if (option === 'pickup' && status === 'approved') {
+  const renderConfirmationContent = (orderStatus: string | null) => {
+    if (option === 'pickup' && orderStatus === 'approved') {
       return (
         <>
           <PoppinsText style={styles.confirmationMessage}>
@@ -319,7 +332,7 @@ const CheckoutScreen = () => {
       );
     }
 
-    if (option === 'delivery' && status === 'approved') {
+    if (option === 'delivery' && orderStatus === 'approved') {
       return (
         <>
           <PoppinsText style={styles.confirmationMessage}>
@@ -340,7 +353,7 @@ const CheckoutScreen = () => {
       );
     }
 
-    if (status === 'rejected') {
+    if (orderStatus === 'rejected') {
       return (
         <>
           <PoppinsText style={styles.confirmationMessage}>
@@ -497,13 +510,22 @@ const CheckoutScreen = () => {
               <PoppinsText style={styles.purchaseOptionsTitle}>
                 Confirmación de Orden
               </PoppinsText>
-              <PaymentStatusMessage
-                status={status}
-                orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
-                userName={userName || 'Usuario'}
-              />
+              {orderStatus ? (
+                <PaymentStatusMessage
+                  orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
+                  userName={userName || 'Usuario'}
+                  orderStatus={
+                    orderStatus as
+                      | 'requested'
+                      | 'approved'
+                      | 'ready_for_pickup'
+                      | 'in_progress'
+                      | 'rejected'
+                  }
+                />
+              ) : null}
               <View style={styles.confirmationContainer}>
-                {renderConfirmationContent(status)}
+                {renderConfirmationContent(orderStatus)}
               </View>
             </>
           )}
diff --git a/src/services/order.ts b/src/services/order.ts
index 81b1f2d..da3c1ae 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -26,4 +26,18 @@ export const OrderService = {
       throw new Error(extractErrorMessage(error));
     }
   },
+
+  getById: async (orderId: string) => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+      const orderDetail = await api.order.getById(orderId, token);
+      return orderDetail;
+    } catch (error) {
+      console.error('Error en OrderService.getById:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };

From e34f08668ba6141d19bb9a37ffb35e321c308443 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 16 May 2025 11:01:29 -0400
Subject: [PATCH 213/291] Fixing cloudinary

---
 babel.config.js                      |    29 +-
 eas.json                             |    13 +
 package-lock.json                    | 16722 ++++++++-----------------
 package.json                         |     4 +-
 src/config.ts                        |     8 +-
 src/screens/ProfileScreen.tsx        |     5 +-
 src/screens/SelectLocationScreen.tsx |     2 +
 src/services/images.ts               |    81 +-
 8 files changed, 5554 insertions(+), 11310 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 96795d1..2cc16f5 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,22 +1,27 @@
+const isProduction = process.env.NODE_ENV === 'production';
+const isDevelopmentBuild = process.env.EAS_BUILD_PROFILE === 'development';
+
 module.exports = function (api) {
   api.cache(true);
+
   return {
     presets: [
       ['babel-preset-expo', { jsxImportSource: 'nativewind' }],
       'nativewind/babel',
     ],
     plugins: [
-      [
-        'module:react-native-dotenv',
-        {
-          moduleName: '@env',
-          path: '.env',
-          blacklist: null,
-          whitelist: null,
-          safe: false,
-          allowUndefined: true,
-        },
-      ],
-    ],
+      !isProduction &&
+        !isDevelopmentBuild && [
+          'module:react-native-dotenv',
+          {
+            moduleName: '@env',
+            path: '.env',
+            blacklist: null,
+            whitelist: null,
+            safe: false,
+            allowUndefined: true,
+          },
+        ],
+    ].filter(Boolean),
   };
 };
diff --git a/eas.json b/eas.json
index 14c9e21..6ed69d9 100644
--- a/eas.json
+++ b/eas.json
@@ -12,6 +12,19 @@
         "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
       }
     },
+    "development": {
+      "developmentClient": true,
+      "android": {
+        "buildType": "apk"
+      },
+      "env": {
+        "PHARMATECH_DEV_MODE": "true",
+        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
+        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
+        "CLOUDINARY_API_KEY": "281941874694529",
+        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
+      }
+    },
     "production": {
       "env": {
         "PHARMATECH_DEV_MODE": "false",
diff --git a/package-lock.json b/package-lock.json
index f4cd845..95c5fb0 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -13,10 +13,10 @@
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
-        "cloudinary-react-native": "^1.0.1",
         "date-fns": "^4.1.0",
         "expo": "~52.0.37",
         "expo-constants": "~17.0.7",
+        "expo-dev-client": "~5.0.20",
         "expo-font": "~13.0.4",
         "expo-image-picker": "~16.0.6",
         "expo-linking": "~7.0.5",
@@ -247,18 +247,6 @@
         "@babel/core": "^7.4.0 || ^8.0.0-0 <8.0.0"
       }
     },
-    "node_modules/@babel/helper-environment-visitor": {
-      "version": "7.24.7",
-      "resolved": "https://registry.npmjs.org/@babel/helper-environment-visitor/-/helper-environment-visitor-7.24.7.tgz",
-      "integrity": "sha512-DoiN84+4Gnd0ncbBOM9AZENV4a5ZiL39HYMyZJGZ/AZEykHYdJw0wW3kdcsh9/Kn+BRXHLkkklZ51ecPKmI1CQ==",
-      "peer": true,
-      "dependencies": {
-        "@babel/types": "^7.24.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
     "node_modules/@babel/helper-member-expression-to-functions": {
       "version": "7.25.9",
       "resolved": "https://registry.npmjs.org/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.25.9.tgz",
@@ -577,25 +565,6 @@
         "@babel/core": "^7.0.0"
       }
     },
-    "node_modules/@babel/plugin-proposal-async-generator-functions": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.20.7.tgz",
-      "integrity": "sha512-xMbiLsn/8RK7Wq7VeVytytS2L6qE69bXPB10YCmMdDZbKF4okCqY74pI/jJQ/8U0b/F6NrT2+14b8/P9/3AMGA==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-async-generator-functions instead.",
-      "peer": true,
-      "dependencies": {
-        "@babel/helper-environment-visitor": "^7.18.9",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/helper-remap-async-to-generator": "^7.18.9",
-        "@babel/plugin-syntax-async-generators": "^7.8.4"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-class-properties": {
       "version": "7.18.6",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.18.6.tgz",
@@ -658,43 +627,6 @@
         "@babel/core": "^7.0.0-0"
       }
     },
-    "node_modules/@babel/plugin-proposal-object-rest-spread": {
-      "version": "7.20.7",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.20.7.tgz",
-      "integrity": "sha512-d2S98yCiLxDVmBmE8UjGcfPvNEUbA1U5q5WxaWFUGRzJSVAZqm5W6MbPct0jxnegUZ0niLeNX+IOzEs7wYg9Dg==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-object-rest-spread instead.",
-      "peer": true,
-      "dependencies": {
-        "@babel/compat-data": "^7.20.5",
-        "@babel/helper-compilation-targets": "^7.20.7",
-        "@babel/helper-plugin-utils": "^7.20.2",
-        "@babel/plugin-syntax-object-rest-spread": "^7.8.3",
-        "@babel/plugin-transform-parameters": "^7.20.7"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
-    "node_modules/@babel/plugin-proposal-optional-catch-binding": {
-      "version": "7.18.6",
-      "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.18.6.tgz",
-      "integrity": "sha512-Q40HEhs9DJQyaZfUjjn6vE8Cv4GmMHCYuMGIWUnlxH6400VGxOuwWsPt4FxXxJkC/5eOzgn0z21M9gMT4MOhbw==",
-      "deprecated": "This proposal has been merged to the ECMAScript standard and thus this plugin is no longer maintained. Please use @babel/plugin-transform-optional-catch-binding instead.",
-      "peer": true,
-      "dependencies": {
-        "@babel/helper-plugin-utils": "^7.18.6",
-        "@babel/plugin-syntax-optional-catch-binding": "^7.8.3"
-      },
-      "engines": {
-        "node": ">=6.9.0"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0-0"
-      }
-    },
     "node_modules/@babel/plugin-proposal-optional-chaining": {
       "version": "7.21.0",
       "resolved": "https://registry.npmjs.org/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.21.0.tgz",
@@ -2168,22 +2100,6 @@
       "resolved": "https://registry.npmjs.org/@bcoe/v8-coverage/-/v8-coverage-0.2.3.tgz",
       "integrity": "sha512-0hYQ8SB4Db5zvZB4axdMHGwEaQjkZzFjQiN9LVYvIFB2nSUHW9tYpxWriPrWDASIxiaXax83REcLxuSdnGPZtw=="
     },
-    "node_modules/@cloudinary/transformation-builder-sdk": {
-      "version": "1.16.1",
-      "resolved": "https://registry.npmjs.org/@cloudinary/transformation-builder-sdk/-/transformation-builder-sdk-1.16.1.tgz",
-      "integrity": "sha512-Mh1qYMkoDxSAzbt0qY9NJaZrdH/vFBcrpeVWmbTXbPVDZHLaaLyJ2+RDFGger5lycbrehPLoNp2hh22BvhkvbQ==",
-      "dependencies": {
-        "@cloudinary/url-gen": "^1.7.0"
-      }
-    },
-    "node_modules/@cloudinary/url-gen": {
-      "version": "1.21.0",
-      "resolved": "https://registry.npmjs.org/@cloudinary/url-gen/-/url-gen-1.21.0.tgz",
-      "integrity": "sha512-ctYcCzX3G3vcgnESTU2ET3K1XsBiXcEnBddCGV0QbR3fJhLLrIShjSMEwZoepgh4LAFOHJu9DzvLFr+E8R7c7g==",
-      "dependencies": {
-        "@cloudinary/transformation-builder-sdk": "^1.15.1"
-      }
-    },
     "node_modules/@egjs/hammerjs": {
       "version": "2.0.17",
       "resolved": "https://registry.npmjs.org/@egjs/hammerjs/-/hammerjs-2.0.17.tgz",
@@ -2503,13 +2419,14 @@
       }
     },
     "node_modules/@expo/config": {
-      "version": "10.0.10",
-      "resolved": "https://registry.npmjs.org/@expo/config/-/config-10.0.10.tgz",
-      "integrity": "sha512-wI9/iam3Irk99ADGM/FyD7YrrEibIZXR4huSZiU5zt9o3dASOKhqepiNJex4YPiktLfKhYrpSEJtwno1g0SrgA==",
+      "version": "10.0.11",
+      "resolved": "https://registry.npmjs.org/@expo/config/-/config-10.0.11.tgz",
+      "integrity": "sha512-nociJ4zr/NmbVfMNe9j/+zRlt7wz/siISu7PjdWE4WE+elEGxWWxsGzltdJG0llzrM+khx8qUiFK5aiVcdMBww==",
+      "license": "MIT",
       "dependencies": {
         "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~9.0.15",
-        "@expo/config-types": "^52.0.4",
+        "@expo/config-plugins": "~9.0.17",
+        "@expo/config-types": "^52.0.5",
         "@expo/json-file": "^9.0.2",
         "deepmerge": "^4.3.1",
         "getenv": "^1.0.0",
@@ -2523,9 +2440,9 @@
       }
     },
     "node_modules/@expo/config-plugins": {
-      "version": "9.0.16",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-9.0.16.tgz",
-      "integrity": "sha512-AnJzmFB7ztM0JZBn+Ut6BQYC2WeGDzfIhBZVOIPMQbdBqvwJ7TmFEsGTGSxdwU/VqJaJK2sWxyt1zbWkpIYCEA==",
+      "version": "9.0.17",
+      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-9.0.17.tgz",
+      "integrity": "sha512-m24F1COquwOm7PBl5wRbkT9P9DviCXe0D7S7nQsolfbhdCWuvMkfXeoWmgjtdhy7sDlOyIgBrAdnB6MfsWKqIg==",
       "license": "MIT",
       "dependencies": {
         "@expo/config-types": "^52.0.5",
@@ -2580,113 +2497,69 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/dev-server": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@expo/dev-server/-/dev-server-0.3.0.tgz",
-      "integrity": "sha512-2A6/8uZADSKAtzyR6YqhCBUFxb5DFmjxmFn0EHMqnPnsh13ZSiKEjrZPrRkM6Li2EHLYqHK2rmweJ7O/7q9pPQ==",
-      "peer": true,
-      "dependencies": {
-        "@expo/bunyan": "4.0.0",
-        "@expo/metro-config": "~0.7.0",
-        "@expo/osascript": "2.0.33",
-        "@expo/spawn-async": "^1.5.0",
-        "body-parser": "^1.20.1",
-        "chalk": "^4.0.0",
-        "connect": "^3.7.0",
-        "fs-extra": "9.0.0",
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1",
-        "node-fetch": "^2.6.0",
-        "open": "^8.3.0",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "serialize-error": "6.0.0",
-        "temp-dir": "^2.0.0"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "peer": true,
+    "node_modules/@expo/devcert": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz",
+      "integrity": "sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==",
       "dependencies": {
-        "@babel/highlight": "^7.10.4"
+        "application-config-path": "^0.1.0",
+        "command-exists": "^1.2.4",
+        "debug": "^3.1.0",
+        "eol": "^0.9.1",
+        "get-port": "^3.2.0",
+        "glob": "^10.4.2",
+        "lodash": "^4.17.21",
+        "mkdirp": "^0.5.1",
+        "password-prompt": "^1.0.4",
+        "sudo-prompt": "^8.2.0",
+        "tmp": "^0.0.33",
+        "tslib": "^2.4.0"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/@expo/bunyan": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/bunyan/-/bunyan-4.0.0.tgz",
-      "integrity": "sha512-Ydf4LidRB/EBI+YrB+cVLqIseiRfjUI/AeHBgjGMtq3GroraDu81OV7zqophRgupngoL3iS3JUMDMnxO7g39qA==",
-      "engines": [
-        "node >=0.10.0"
-      ],
-      "peer": true,
+    "node_modules/@expo/devcert/node_modules/debug": {
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
+      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
       "dependencies": {
-        "uuid": "^8.0.0"
-      },
-      "optionalDependencies": {
-        "mv": "~2",
-        "safe-json-stringify": "~1"
+        "ms": "^2.1.1"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/@expo/config": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.0.5.tgz",
-      "integrity": "sha512-3CnLmtAQUWqLZwTRliS23QoFwdyhg4AWtp6gZ0qfcXthR84RvlZKcCDQQIyPiRUgu8dZa+gQDcdRJtgE+GM5XQ==",
-      "peer": true,
+    "node_modules/@expo/env": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.4.2.tgz",
+      "integrity": "sha512-TgbCgvSk0Kq0e2fLoqHwEBL4M0ztFjnBEz0YCDm5boc1nvkV1VMuIMteVdeBwnTh8Z0oPJTwHCD49vhMEt1I6A==",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~6.0.0",
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "^8.2.37",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "require-from-string": "^2.0.2",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "slugify": "^1.3.4",
-        "sucrase": "^3.20.0"
+        "chalk": "^4.0.0",
+        "debug": "^4.3.4",
+        "dotenv": "~16.4.5",
+        "dotenv-expand": "~11.0.6",
+        "getenv": "^1.0.0"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
-      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
-      "peer": true,
+    "node_modules/@expo/fingerprint": {
+      "version": "0.11.11",
+      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.11.11.tgz",
+      "integrity": "sha512-gNyn1KnAOpEa8gSNsYqXMTcq0fSwqU/vit6fP5863vLSKxHm/dNt/gm/uZJxrRZxKq71KUJWF6I7d3z8qIfq5g==",
       "dependencies": {
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "~8.2.37",
-        "@expo/plist": "^0.0.20",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
+        "@expo/spawn-async": "^1.7.2",
+        "arg": "^5.0.2",
         "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
+        "debug": "^4.3.4",
+        "find-up": "^5.0.0",
         "getenv": "^1.0.0",
-        "glob": "7.1.6",
+        "minimatch": "^3.0.4",
+        "p-limit": "^3.1.0",
         "resolve-from": "^5.0.0",
-        "semver": "^7.3.5",
-        "slash": "^3.0.0",
-        "xcode": "^3.0.1",
-        "xml2js": "0.4.23"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins/node_modules/@expo/json-file": {
-      "version": "8.2.37",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
-      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
-      "peer": true,
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
+        "semver": "^7.6.0"
+      },
+      "bin": {
+        "fingerprint": "bin/cli.js"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/@expo/config-plugins/node_modules/semver": {
+    "node_modules/@expo/fingerprint/node_modules/semver": {
       "version": "7.7.1",
       "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
       "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "peer": true,
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2694,67 +2567,27 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/@expo/config-types": {
-      "version": "48.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
-      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A==",
-      "peer": true
-    },
-    "node_modules/@expo/dev-server/node_modules/@expo/json-file": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.3.3.tgz",
-      "integrity": "sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A==",
-      "peer": true,
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/@expo/metro-config": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.7.1.tgz",
-      "integrity": "sha512-vGWU62Zp5pRGw5IEHDNdqvsy62/hu/Na7bswePYVjoaItOjJY7+qilFeF0AAK+3V8qAM8fpltH3ByylKfWaA7A==",
-      "peer": true,
+    "node_modules/@expo/image-utils": {
+      "version": "0.6.5",
+      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.6.5.tgz",
+      "integrity": "sha512-RsS/1CwJYzccvlprYktD42KjyfWZECH6PPIEowvoSmXfGLfdViwcUEI4RvBfKX5Jli6P67H+6YmHvPTbGOboew==",
       "dependencies": {
-        "@expo/config": "~8.0.0",
-        "chalk": "^4.1.0",
-        "debug": "^4.3.2",
-        "find-yarn-workspace-root": "~2.0.0",
+        "@expo/spawn-async": "^1.7.2",
+        "chalk": "^4.0.0",
+        "fs-extra": "9.0.0",
         "getenv": "^1.0.0",
+        "jimp-compact": "0.16.1",
+        "parse-png": "^2.1.0",
         "resolve-from": "^5.0.0",
-        "sucrase": "^3.20.0"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/@expo/osascript": {
-      "version": "2.0.33",
-      "resolved": "https://registry.npmjs.org/@expo/osascript/-/osascript-2.0.33.tgz",
-      "integrity": "sha512-FQinlwHrTlJbntp8a7NAlCKedVXe06Va/0DSLXRO8lZVtgbEMrYYSUZWQNcOlNtc58c2elNph6z9dMOYwSo3JQ==",
-      "peer": true,
-      "dependencies": {
-        "@expo/spawn-async": "^1.5.0",
-        "exec-async": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/@expo/plist": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
-      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
-      "peer": true,
-      "dependencies": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
+        "semver": "^7.6.0",
+        "temp-dir": "~2.0.0",
+        "unique-string": "~2.0.0"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/fs-extra": {
+    "node_modules/@expo/image-utils/node_modules/fs-extra": {
       "version": "9.0.0",
       "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
       "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-      "peer": true,
       "dependencies": {
         "at-least-node": "^1.0.0",
         "graceful-fs": "^4.2.0",
@@ -2765,32 +2598,10 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "peer": true,
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/jsonfile": {
+    "node_modules/@expo/image-utils/node_modules/jsonfile": {
       "version": "6.1.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
       "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "peer": true,
       "dependencies": {
         "universalify": "^2.0.0"
       },
@@ -2798,37 +2609,18 @@
         "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/jsonfile/node_modules/universalify": {
+    "node_modules/@expo/image-utils/node_modules/jsonfile/node_modules/universalify": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
       "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "peer": true,
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "peer": true,
+    "node_modules/@expo/image-utils/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
       "bin": {
         "semver": "bin/semver.js"
       },
@@ -2836,211 +2628,22 @@
         "node": ">=10"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/serialize-error": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/serialize-error/-/serialize-error-6.0.0.tgz",
-      "integrity": "sha512-3vmBkMZLQO+BR4RPHcyRGdE09XCF6cvxzk2N2qn8Er3F91cy8Qt7VvEbZBOpaL53qsBbe2cFOefU6tRY6WDelA==",
-      "peer": true,
-      "dependencies": {
-        "type-fest": "^0.12.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/type-fest": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.12.0.tgz",
-      "integrity": "sha512-53RyidyjvkGpnWPMF9bQgFtWp+Sl8O2Rp13VavmJgfAP9WWG6q6TkrKU8iyJdnwnfgHI6k2hTlgqH4aSdjoTbg==",
-      "peer": true,
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/universalify": {
+    "node_modules/@expo/image-utils/node_modules/universalify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
       "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "peer": true,
       "engines": {
         "node": ">= 10.0.0"
       }
     },
-    "node_modules/@expo/dev-server/node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
+    "node_modules/@expo/json-file": {
+      "version": "9.0.2",
+      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-9.0.2.tgz",
+      "integrity": "sha512-yAznIUrybOIWp3Uax7yRflB0xsEpvIwIEqIjao9SGi2Gaa+N0OamWfe0fnXBSWF+2zzF4VvqwT4W5zwelchfgw==",
       "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/@expo/dev-server/node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "peer": true,
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/@expo/devcert": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/@expo/devcert/-/devcert-1.1.4.tgz",
-      "integrity": "sha512-fqBODr8c72+gBSX5Ty3SIzaY4bXainlpab78+vEYEKL3fXmsOswMLf0+KE36mUEAa36BYabX7K3EiXOXX5OPMw==",
-      "dependencies": {
-        "application-config-path": "^0.1.0",
-        "command-exists": "^1.2.4",
-        "debug": "^3.1.0",
-        "eol": "^0.9.1",
-        "get-port": "^3.2.0",
-        "glob": "^10.4.2",
-        "lodash": "^4.17.21",
-        "mkdirp": "^0.5.1",
-        "password-prompt": "^1.0.4",
-        "sudo-prompt": "^8.2.0",
-        "tmp": "^0.0.33",
-        "tslib": "^2.4.0"
-      }
-    },
-    "node_modules/@expo/devcert/node_modules/debug": {
-      "version": "3.2.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-3.2.7.tgz",
-      "integrity": "sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==",
-      "dependencies": {
-        "ms": "^2.1.1"
-      }
-    },
-    "node_modules/@expo/env": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.4.2.tgz",
-      "integrity": "sha512-TgbCgvSk0Kq0e2fLoqHwEBL4M0ztFjnBEz0YCDm5boc1nvkV1VMuIMteVdeBwnTh8Z0oPJTwHCD49vhMEt1I6A==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "debug": "^4.3.4",
-        "dotenv": "~16.4.5",
-        "dotenv-expand": "~11.0.6",
-        "getenv": "^1.0.0"
-      }
-    },
-    "node_modules/@expo/fingerprint": {
-      "version": "0.11.11",
-      "resolved": "https://registry.npmjs.org/@expo/fingerprint/-/fingerprint-0.11.11.tgz",
-      "integrity": "sha512-gNyn1KnAOpEa8gSNsYqXMTcq0fSwqU/vit6fP5863vLSKxHm/dNt/gm/uZJxrRZxKq71KUJWF6I7d3z8qIfq5g==",
-      "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "arg": "^5.0.2",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.4",
-        "find-up": "^5.0.0",
-        "getenv": "^1.0.0",
-        "minimatch": "^3.0.4",
-        "p-limit": "^3.1.0",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.6.0"
-      },
-      "bin": {
-        "fingerprint": "bin/cli.js"
-      }
-    },
-    "node_modules/@expo/fingerprint/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@expo/image-utils": {
-      "version": "0.6.5",
-      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.6.5.tgz",
-      "integrity": "sha512-RsS/1CwJYzccvlprYktD42KjyfWZECH6PPIEowvoSmXfGLfdViwcUEI4RvBfKX5Jli6P67H+6YmHvPTbGOboew==",
-      "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "chalk": "^4.0.0",
-        "fs-extra": "9.0.0",
-        "getenv": "^1.0.0",
-        "jimp-compact": "0.16.1",
-        "parse-png": "^2.1.0",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.6.0",
-        "temp-dir": "~2.0.0",
-        "unique-string": "~2.0.0"
-      }
-    },
-    "node_modules/@expo/image-utils/node_modules/fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@expo/image-utils/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/@expo/image-utils/node_modules/jsonfile/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@expo/image-utils/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@expo/image-utils/node_modules/universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/@expo/json-file": {
-      "version": "9.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-9.0.2.tgz",
-      "integrity": "sha512-yAznIUrybOIWp3Uax7yRflB0xsEpvIwIEqIjao9SGi2Gaa+N0OamWfe0fnXBSWF+2zzF4VvqwT4W5zwelchfgw==",
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.3",
-        "write-file-atomic": "^2.3.0"
+        "@babel/code-frame": "~7.10.4",
+        "json5": "^2.2.3",
+        "write-file-atomic": "^2.3.0"
       }
     },
     "node_modules/@expo/json-file/node_modules/@babel/code-frame": {
@@ -3322,12 +2925,6 @@
         "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/@gar/promisify": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@gar/promisify/-/promisify-1.1.3.tgz",
-      "integrity": "sha512-k2Ty1JcVojjJFwrg/ThKi2ujJ7XNLYaFGNB/bWT9wGR+oSMJHMa5w+CUq6p/pVrKeNNgA7pCqEcjSnHVoqJQFw==",
-      "peer": true
-    },
     "node_modules/@humanfs/core": {
       "version": "0.19.1",
       "resolved": "https://registry.npmjs.org/@humanfs/core/-/core-0.19.1.tgz",
@@ -3931,11 +3528,6 @@
         "@jridgewell/sourcemap-codec": "^1.4.14"
       }
     },
-    "node_modules/@leichtgewicht/ip-codec": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/@leichtgewicht/ip-codec/-/ip-codec-2.0.5.tgz",
-      "integrity": "sha512-Vo+PSpZG2/fmgmiNzYK9qWRh8h/CHrwD0mo1h1DzL4yzHNSfWYujGTYsWGreD000gcgmZ7K4Ys6Tx9TxtsKdDw=="
-    },
     "node_modules/@nodelib/fs.scandir": {
       "version": "2.1.5",
       "resolved": "https://registry.npmjs.org/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz",
@@ -3999,32 +3591,6 @@
         "node": ">=10"
       }
     },
-    "node_modules/@npmcli/move-file": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@npmcli/move-file/-/move-file-1.1.2.tgz",
-      "integrity": "sha512-1SUf/Cg2GzGDyaf15aR9St9TWlb+XvbZXWpDx8YKs7MLzMH/BCeopv+y9vzrzgkfykCGuWOlSu3mZhj2+FQcrg==",
-      "deprecated": "This functionality has been moved to @npmcli/fs",
-      "peer": true,
-      "dependencies": {
-        "mkdirp": "^1.0.4",
-        "rimraf": "^3.0.2"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/@npmcli/move-file/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "peer": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
     "node_modules/@pharmatech/sdk": {
       "version": "0.4.11",
       "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
@@ -4408,12 +3974,6 @@
         "@babel/core": "*"
       }
     },
-    "node_modules/@react-native/normalize-color": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/@react-native/normalize-color/-/normalize-color-2.1.0.tgz",
-      "integrity": "sha512-Z1jQI2NpdFJCVgpY+8Dq/Bt3d+YUi1928Q+/CZm/oh66fzM0RUl54vvuXlPJKybH4pdCZey1eDTPaLHkMPNgWA==",
-      "peer": true
-    },
     "node_modules/@react-native/normalize-colors": {
       "version": "0.76.7",
       "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.76.7.tgz",
@@ -5087,19 +4647,11 @@
         "node": ">= 10"
       }
     },
-    "node_modules/@tradle/react-native-http": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/@tradle/react-native-http/-/react-native-http-2.0.1.tgz",
-      "integrity": "sha512-pBLa/mlkD5HE4e8ndF6l8gj4ZUVYlrpRbrODeuxL0+ZFJ0TmBvQ9+bUNy8gNdWTS6kik2fW+u7eiYMeGaISkrA==",
-      "dependencies": {
-        "Base64": "~0.2.0",
-        "inherits": "~2.0.1"
-      }
-    },
     "node_modules/@trysound/sax": {
       "version": "0.2.0",
       "resolved": "https://registry.npmjs.org/@trysound/sax/-/sax-0.2.0.tgz",
       "integrity": "sha512-L7z9BgrNEcYyUYtF+HaEfiS5ebkh9jXqbszz7pC0hRBPaatV0XjSD3+eHrpqFemQfgwiFF0QPIarnIihIDn7OA==",
+      "dev": true,
       "license": "ISC",
       "engines": {
         "node": ">=10.13.0"
@@ -5142,44 +4694,11 @@
         "@babel/types": "^7.20.7"
       }
     },
-    "node_modules/@types/body-parser": {
-      "version": "1.19.5",
-      "resolved": "https://registry.npmjs.org/@types/body-parser/-/body-parser-1.19.5.tgz",
-      "integrity": "sha512-fB3Zu92ucau0iQ0JMCFQE7b/dv8Ot07NI3KaZIkIUNXq82k4eBAqUaneXfleGY9JWskeS9y+u0nXMyspcuQrCg==",
-      "dependencies": {
-        "@types/connect": "*",
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/bonjour": {
-      "version": "3.5.13",
-      "resolved": "https://registry.npmjs.org/@types/bonjour/-/bonjour-3.5.13.tgz",
-      "integrity": "sha512-z9fJ5Im06zvUL548KvYNecEVlA7cVDkGUi6kZusb04mpyEFKCIZJvloCcmpmLaIahDpOQGHaHmG6imtPMmPXGQ==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect": {
-      "version": "3.4.38",
-      "resolved": "https://registry.npmjs.org/@types/connect/-/connect-3.4.38.tgz",
-      "integrity": "sha512-K6uROf1LD88uDQqJCktA4yzL1YYAK6NgfsI0v/mTgyPKWsX1CnJ0XPSDhViejru1GcRkLWb8RlzFYJRqGUbaug==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/connect-history-api-fallback": {
-      "version": "1.5.4",
-      "resolved": "https://registry.npmjs.org/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.5.4.tgz",
-      "integrity": "sha512-n6Cr2xS1h4uAulPRdlw6Jl6s1oG8KrVilPN2yUITEs+K48EzMJJ3W1xy8K5eWuFvjp3R74AOIGSmp2UfBJ8HFw==",
-      "dependencies": {
-        "@types/express-serve-static-core": "*",
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/eslint": {
       "version": "9.6.1",
       "resolved": "https://registry.npmjs.org/@types/eslint/-/eslint-9.6.1.tgz",
       "integrity": "sha512-FXx2pKgId/WyYo2jXw63kk7/+TY7u7AziEJxJAnSFzHlqTAS3Ync6SvgYAN/k4/PQpnnVuzoMuVnByKK2qp0ag==",
+      "peer": true,
       "dependencies": {
         "@types/estree": "*",
         "@types/json-schema": "*"
@@ -5189,6 +4708,7 @@
       "version": "3.7.7",
       "resolved": "https://registry.npmjs.org/@types/eslint-scope/-/eslint-scope-3.7.7.tgz",
       "integrity": "sha512-MzMFlSLBqNF2gcHWO0G1vP/YQyfvrxZ0bF+u7mzUdZ1/xK4A4sru+nraZz5i3iEIk1l1uyicaDVTB4QbbEkAYg==",
+      "peer": true,
       "dependencies": {
         "@types/eslint": "*",
         "@types/estree": "*"
@@ -5199,54 +4719,12 @@
       "resolved": "https://registry.npmjs.org/@types/estree/-/estree-1.0.6.tgz",
       "integrity": "sha512-AYnb1nQyY49te+VRAVgmzfcgjYS91mY5P0TKUDCLEM+gNnA+3T6rWITXRLYCpahpqSQbN5cE+gHpnPyXjHWxcw=="
     },
-    "node_modules/@types/express": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/@types/express/-/express-4.17.21.tgz",
-      "integrity": "sha512-ejlPM315qwLpaQlQDTjPdsUFSc6ZsP4AN6AlWnogPjQ7CVi7PYF3YVz+CY3jE2pwYf7E/7HlDAN0rV2GxTG0HQ==",
-      "dependencies": {
-        "@types/body-parser": "*",
-        "@types/express-serve-static-core": "^4.17.33",
-        "@types/qs": "*",
-        "@types/serve-static": "*"
-      }
-    },
-    "node_modules/@types/express-serve-static-core": {
-      "version": "5.0.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-5.0.6.tgz",
-      "integrity": "sha512-3xhRnjJPkULekpSzgtoNYYcTWgEZkp4myc+Saevii5JPnHNvHMRlBSHDbs7Bh1iPPoVTERHEZXyhyLbMEsExsA==",
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/express/node_modules/@types/express-serve-static-core": {
-      "version": "4.19.6",
-      "resolved": "https://registry.npmjs.org/@types/express-serve-static-core/-/express-serve-static-core-4.19.6.tgz",
-      "integrity": "sha512-N4LZ2xG7DatVqhCZzOGb1Yi5lMbXSZcmdLDe9EzSndPV2HpWYWzRbaerl2n27irrm94EPpprqa8KpskPT085+A==",
-      "dependencies": {
-        "@types/node": "*",
-        "@types/qs": "*",
-        "@types/range-parser": "*",
-        "@types/send": "*"
-      }
-    },
     "node_modules/@types/geojson": {
       "version": "7946.0.16",
       "resolved": "https://registry.npmjs.org/@types/geojson/-/geojson-7946.0.16.tgz",
       "integrity": "sha512-6C8nqWur3j98U6+lXDfTUWIfgvZU+EumvpHKcYjujKH7woYyLj2sUmff0tRhrqM7BohUw7Pz3ZB1jj2gW9Fvmg==",
       "license": "MIT"
     },
-    "node_modules/@types/glob": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/@types/glob/-/glob-7.2.0.tgz",
-      "integrity": "sha512-ZUxbzKl0IfJILTS6t7ip5fQQM/J3TJYubDm3nMbgubNNYS62eXeUpoLUC8/7fJNiFYHTrGPQn7hspDUzIHX3UA==",
-      "dependencies": {
-        "@types/minimatch": "*",
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/graceful-fs": {
       "version": "4.1.9",
       "resolved": "https://registry.npmjs.org/@types/graceful-fs/-/graceful-fs-4.1.9.tgz",
@@ -5262,24 +4740,6 @@
       "dev": true,
       "license": "MIT"
     },
-    "node_modules/@types/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/@types/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-oh/6byDPnL1zeNXFrDXFLyZjkr1MsBG667IM792caf1L2UPOOMf65NFzjUH/ltyfwjAGfs1rsX1eftK0jC/KIg=="
-    },
-    "node_modules/@types/http-errors": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/@types/http-errors/-/http-errors-2.0.4.tgz",
-      "integrity": "sha512-D0CFMMtydbJAegzOyHjtiKPLlvnm3iTZyZRSZoLq2mRhDdmLfIWOCYPfQJ4cu2erKghU++QvjcUjp/5h7hESpA=="
-    },
-    "node_modules/@types/http-proxy": {
-      "version": "1.17.16",
-      "resolved": "https://registry.npmjs.org/@types/http-proxy/-/http-proxy-1.17.16.tgz",
-      "integrity": "sha512-sdWoUajOB1cd0A8cRRQ1cfyWNbmFKLAqBB89Y8x5iYyG/mkJHc0YUH8pdWBy2omi9qtCpiIgGjuwO0dQST2l5w==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/istanbul-lib-coverage": {
       "version": "2.0.6",
       "resolved": "https://registry.npmjs.org/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.6.tgz",
@@ -5326,16 +4786,6 @@
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.15.tgz",
       "integrity": "sha512-5+fP8P8MFNC+AyZCDxrB2pkZFPGzqQWUzpSeuuVLvm8VMcorNYavBqoFcxK8bQz4Qsbn4oUEEem4wDLfcysGHA=="
     },
-    "node_modules/@types/mime": {
-      "version": "1.3.5",
-      "resolved": "https://registry.npmjs.org/@types/mime/-/mime-1.3.5.tgz",
-      "integrity": "sha512-/pyBZWSLD2n0dcHE3hq8s8ZvcETHtEuF+3E7XVt0Ig2nvsVQXdghHVcEkIWjy9A0wKfTn97a/PSDYohKIlnP/w=="
-    },
-    "node_modules/@types/minimatch": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/@types/minimatch/-/minimatch-5.1.2.tgz",
-      "integrity": "sha512-K0VQKziLUWkVKiRVrx4a40iPaxTUefQmjtkQofBkYRcoaaL/8rhwDWww9qWbrgicNOgnpIsMxyNIUM4+n6dUIA=="
-    },
     "node_modules/@types/node": {
       "version": "22.13.5",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-22.13.5.tgz",
@@ -5358,16 +4808,6 @@
       "integrity": "sha512-gNMvNH49DJ7OJYv+KAKn0Xp45p8PLl6zo2YnvDIbTd4J6MER2BmWN49TG7n9LvkyihINxeKW8+3bfS2yDC9dzQ==",
       "devOptional": true
     },
-    "node_modules/@types/qs": {
-      "version": "6.9.18",
-      "resolved": "https://registry.npmjs.org/@types/qs/-/qs-6.9.18.tgz",
-      "integrity": "sha512-kK7dgTYDyGqS+e2Q4aK9X3D7q234CIZ1Bv0q/7Z5IwRDoADNU81xXJK/YVyLbLTZCoIwUoDoffFeF+p/eIklAA=="
-    },
-    "node_modules/@types/range-parser": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/@types/range-parser/-/range-parser-1.2.7.tgz",
-      "integrity": "sha512-hKormJbkJqzQGhziax5PItDUTMAM9uE2XXQmM37dyd4hVM+5aVl7oVxMVUiVQn2oCQFN/LKCZdvSM0pFRqbSmQ=="
-    },
     "node_modules/@types/react": {
       "version": "18.3.18",
       "resolved": "https://registry.npmjs.org/@types/react/-/react-18.3.18.tgz",
@@ -5378,55 +4818,15 @@
         "csstype": "^3.0.2"
       }
     },
-    "node_modules/@types/retry": {
-      "version": "0.12.0",
-      "resolved": "https://registry.npmjs.org/@types/retry/-/retry-0.12.0.tgz",
-      "integrity": "sha512-wWKOClTTiizcZhXnPY4wikVAwmdYHp8q6DmC+EJUzAMsycb7HB32Kh9RN4+0gExjmPmZSAQjgURXIGATPegAvA=="
-    },
-    "node_modules/@types/send": {
-      "version": "0.17.4",
-      "resolved": "https://registry.npmjs.org/@types/send/-/send-0.17.4.tgz",
-      "integrity": "sha512-x2EM6TJOybec7c52BX0ZspPodMsQUd5L6PRwOunVyVUhXiBSKf3AezDL8Dgvgt5o0UfKNfuA0eMLr2wLT4AiBA==",
-      "dependencies": {
-        "@types/mime": "^1",
-        "@types/node": "*"
-      }
+    "node_modules/@types/stack-utils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
+      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
     },
-    "node_modules/@types/serve-index": {
-      "version": "1.9.4",
-      "resolved": "https://registry.npmjs.org/@types/serve-index/-/serve-index-1.9.4.tgz",
-      "integrity": "sha512-qLpGZ/c2fhSs5gnYsQxtDEq3Oy8SXPClIXkW5ghvAvsNuVSA8k+gCONcUCS/UjLEYvYps+e8uBtfgXgvhwfNug==",
-      "dependencies": {
-        "@types/express": "*"
-      }
-    },
-    "node_modules/@types/serve-static": {
-      "version": "1.15.7",
-      "resolved": "https://registry.npmjs.org/@types/serve-static/-/serve-static-1.15.7.tgz",
-      "integrity": "sha512-W8Ym+h8nhuRwaKPaDw34QUkwsGi6Rc4yYqvKFo5rm2FUEhCFbzVWrxXUxuKK8TASjWsysJY0nsmNCGhCOIsrOw==",
-      "dependencies": {
-        "@types/http-errors": "*",
-        "@types/node": "*",
-        "@types/send": "*"
-      }
-    },
-    "node_modules/@types/sockjs": {
-      "version": "0.3.36",
-      "resolved": "https://registry.npmjs.org/@types/sockjs/-/sockjs-0.3.36.tgz",
-      "integrity": "sha512-MK9V6NzAS1+Ud7JV9lJLFqW85VbC9dq3LmwZCuBe4wBDgKC0Kj/jd8Xl+nSviU+Qc3+m7umHHyHg//2KSa0a0Q==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
-    "node_modules/@types/stack-utils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/@types/stack-utils/-/stack-utils-2.0.3.tgz",
-      "integrity": "sha512-9aEbYZ3TbYMznPdcdr3SmIrLXwC/AKZXQeCf9Pgao5CKb8CyHuEX5jzWPTkvregvhRJHcpRO6BFoGW9ycaOkYw=="
-    },
-    "node_modules/@types/tough-cookie": {
-      "version": "4.0.5",
-      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
-      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
+    "node_modules/@types/tough-cookie": {
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@types/tough-cookie/-/tough-cookie-4.0.5.tgz",
+      "integrity": "sha512-/Ad8+nIOV7Rl++6f1BdKxFSMgmoqEoYbHRpPcx3JEfv8VRsQe9Z4mCXeJBzxs7mbHY/XOZZuXlRNfhpVPbs6ZA=="
     },
     "node_modules/@types/use-sync-external-store": {
       "version": "0.0.6",
@@ -5434,14 +4834,6 @@
       "integrity": "sha512-zFDAD+tlpf2r4asuHEj0XH6pY6i0g5NeAHPn+15wk3BV6JA69eERFXC1gyGThDkVa1zCyKr5jox1+2LbV/AMLg==",
       "license": "MIT"
     },
-    "node_modules/@types/ws": {
-      "version": "8.18.1",
-      "resolved": "https://registry.npmjs.org/@types/ws/-/ws-8.18.1.tgz",
-      "integrity": "sha512-ThVF6DCVhA8kUGy+aazFQ4kXQ7E1Ty7A3ypFOe0IcJV8O/M511G99AW24irKrW56Wt44yG9+ij8FaqoBGkuBXg==",
-      "dependencies": {
-        "@types/node": "*"
-      }
-    },
     "node_modules/@types/yargs": {
       "version": "17.0.33",
       "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-17.0.33.tgz",
@@ -5688,6 +5080,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ast/-/ast-1.14.1.tgz",
       "integrity": "sha512-nuBEDgQfm1ccRp/8bCQrx1frohyufl4JlbMMZ4P1wpeOfDhF6FQkxZJ1b/e+PLwr6X1Nhw6OLme5usuBWYBvuQ==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/helper-numbers": "1.13.2",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2"
@@ -5696,22 +5089,26 @@
     "node_modules/@webassemblyjs/floating-point-hex-parser": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.13.2.tgz",
-      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA=="
+      "integrity": "sha512-6oXyTOzbKxGH4steLbLNOu71Oj+C8Lg34n6CqRvqfS2O71BxY6ByfMDRhBytzknj9yGUPVJ1qIKhRlAwO1AovA==",
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-api-error": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-api-error/-/helper-api-error-1.13.2.tgz",
-      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ=="
+      "integrity": "sha512-U56GMYxy4ZQCbDZd6JuvvNV/WFildOjsaWD3Tzzvmw/mas3cXzRJPMjP83JqEsgSbyrmaGjBfDtV7KDXV9UzFQ==",
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-buffer": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-buffer/-/helper-buffer-1.14.1.tgz",
-      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA=="
+      "integrity": "sha512-jyH7wtcHiKssDtFPRB+iQdxlDf96m0E39yb0k5uJVhFGleZFoNw1c4aeIcVUPPbXUVJ94wwnMOAqUHyzoEPVMA==",
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-numbers": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-numbers/-/helper-numbers-1.13.2.tgz",
       "integrity": "sha512-FE8aCmS5Q6eQYcV3gI35O4J789wlQA+7JrqTTpJqn5emA4U2hvwJmvFRC0HODS+3Ye6WioDklgd6scJ3+PLnEA==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/floating-point-hex-parser": "1.13.2",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -5721,12 +5118,14 @@
     "node_modules/@webassemblyjs/helper-wasm-bytecode": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.13.2.tgz",
-      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA=="
+      "integrity": "sha512-3QbLKy93F0EAIXLh0ogEVR6rOubA9AoZ+WRYhNbFyuB70j3dRdwH9g+qXhLAO0kiYGlg3TxDV+I4rQTr/YNXkA==",
+      "peer": true
     },
     "node_modules/@webassemblyjs/helper-wasm-section": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.14.1.tgz",
       "integrity": "sha512-ds5mXEqTJ6oxRoqjhWDU83OgzAYjwsCV8Lo/N+oRsNDmx/ZDpqalmrtgOMkHwxsG0iI//3BwWAErYRHtgn0dZw==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5738,6 +5137,7 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/ieee754/-/ieee754-1.13.2.tgz",
       "integrity": "sha512-4LtOzh58S/5lX4ITKxnAK2USuNEvpdVV9AlgGQb8rJDHaLeHciwG4zlGr0j/SNWlr7x3vO1lDEsuePvtcDNCkw==",
+      "peer": true,
       "dependencies": {
         "@xtuc/ieee754": "^1.2.0"
       }
@@ -5746,6 +5146,7 @@
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/leb128/-/leb128-1.13.2.tgz",
       "integrity": "sha512-Lde1oNoIdzVzdkNEAWZ1dZ5orIbff80YPdHx20mrHwHrVNNTjNr8E3xz9BdpcGqRQbAEa+fkrCb+fRFTl/6sQw==",
+      "peer": true,
       "dependencies": {
         "@xtuc/long": "4.2.2"
       }
@@ -5753,12 +5154,14 @@
     "node_modules/@webassemblyjs/utf8": {
       "version": "1.13.2",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/utf8/-/utf8-1.13.2.tgz",
-      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ=="
+      "integrity": "sha512-3NQWGjKTASY1xV5m7Hr0iPeXD9+RDobLll3T9d2AO+g3my8xy5peVyjSag4I50mR1bBSN/Ct12lo+R9tJk0NZQ==",
+      "peer": true
     },
     "node_modules/@webassemblyjs/wasm-edit": {
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-edit/-/wasm-edit-1.14.1.tgz",
       "integrity": "sha512-RNJUIQH/J8iA/1NzlE4N7KtyZNHi3w7at7hDjvRNm5rcUXa00z1vRz3glZoULfJ5mpvYhLybmVcwcjGrC1pRrQ==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5774,6 +5177,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-gen/-/wasm-gen-1.14.1.tgz",
       "integrity": "sha512-AmomSIjP8ZbfGQhumkNvgC33AY7qtMCXnN6bL2u2Js4gVCg8fp735aEiMSBbDR7UQIj90n4wKAFUSEd0QN2Ukg==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-wasm-bytecode": "1.13.2",
@@ -5786,6 +5190,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-opt/-/wasm-opt-1.14.1.tgz",
       "integrity": "sha512-PTcKLUNvBqnY2U6E5bdOQcSM+oVP/PmrDY9NzowJjislEjwP/C4an2303MCVS2Mg9d3AJpIGdUFIQQWbPds0Sw==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-buffer": "1.14.1",
@@ -5797,6 +5202,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wasm-parser/-/wasm-parser-1.14.1.tgz",
       "integrity": "sha512-JLBl+KZ0R5qB7mCnud/yyX08jWFw5MsoalJ1pQ4EdFlgj9VdXKGuENGsiCIjegI1W7p91rUlcB/LB5yRJKNTcQ==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@webassemblyjs/helper-api-error": "1.13.2",
@@ -5810,6 +5216,7 @@
       "version": "1.14.1",
       "resolved": "https://registry.npmjs.org/@webassemblyjs/wast-printer/-/wast-printer-1.14.1.tgz",
       "integrity": "sha512-kPSSXE6De1XOR820C90RIo2ogvZG+c3KiHzqUoO/F34Y2shGzesfqv7o57xrxovZJH/MetF5UjroJ/R/3isoiw==",
+      "peer": true,
       "dependencies": {
         "@webassemblyjs/ast": "1.14.1",
         "@xtuc/long": "4.2.2"
@@ -5827,12 +5234,14 @@
     "node_modules/@xtuc/ieee754": {
       "version": "1.2.0",
       "resolved": "https://registry.npmjs.org/@xtuc/ieee754/-/ieee754-1.2.0.tgz",
-      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA=="
+      "integrity": "sha512-DX8nKgqcGwsc0eJSqYt5lwP4DH5FlHnmuWWBRy7X0NcaGR0ZtuyeESgMwTYVEtxmsNGY+qit4QYT/MIYTOTPeA==",
+      "peer": true
     },
     "node_modules/@xtuc/long": {
       "version": "4.2.2",
       "resolved": "https://registry.npmjs.org/@xtuc/long/-/long-4.2.2.tgz",
-      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ=="
+      "integrity": "sha512-NuHqBY1PB/D8xU6s/thBgOAiAP7HOYDQ32+BFZILJ8ivkUkAHQnWfn6WhL79Owj1qmUnoN/YPhktdIoucipkAQ==",
+      "peer": true
     },
     "node_modules/abab": {
       "version": "2.0.6",
@@ -5851,16 +5260,6 @@
         "node": ">=6.5"
       }
     },
-    "node_modules/abstract-leveldown": {
-      "version": "2.6.1",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-2.6.1.tgz",
-      "integrity": "sha512-z3y8+/Y5i90z+viZGYIg7Tu+muVO4qGHAeug7QQ7oQcMaS1RY+3ccwHTISI/vkVAK9r7snv8lMICNdmrYM/LkA==",
-      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
-      "peer": true,
-      "dependencies": {
-        "xtend": "~4.0.0"
-      }
-    },
     "node_modules/accepts": {
       "version": "1.3.8",
       "resolved": "https://registry.npmjs.org/accepts/-/accepts-1.3.8.tgz",
@@ -5951,6 +5350,7 @@
       "version": "6.12.6",
       "resolved": "https://registry.npmjs.org/ajv/-/ajv-6.12.6.tgz",
       "integrity": "sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==",
+      "dev": true,
       "dependencies": {
         "fast-deep-equal": "^3.1.1",
         "fast-json-stable-stringify": "^2.0.0",
@@ -5998,14 +5398,6 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/ajv-keywords": {
-      "version": "3.5.2",
-      "resolved": "https://registry.npmjs.org/ajv-keywords/-/ajv-keywords-3.5.2.tgz",
-      "integrity": "sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==",
-      "peerDependencies": {
-        "ajv": "^6.9.1"
-      }
-    },
     "node_modules/anser": {
       "version": "1.4.10",
       "resolved": "https://registry.npmjs.org/anser/-/anser-1.4.10.tgz",
@@ -6025,17 +5417,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/ansi-html-community": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/ansi-html-community/-/ansi-html-community-0.0.8.tgz",
-      "integrity": "sha512-1APHAyr3+PCamwNw3bXCPp4HFLONZt/yIH0sZp0/469KWNTEy+qN5jQ3GVX6DMZ1UXAi34yVwtTeaG/HpBuuzw==",
-      "engines": [
-        "node >= 0.8.0"
-      ],
-      "bin": {
-        "ansi-html": "bin/ansi-html"
-      }
-    },
     "node_modules/ansi-regex": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-5.0.1.tgz",
@@ -6104,16 +5485,11 @@
         "sprintf-js": "~1.0.2"
       }
     },
-    "node_modules/argsarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/argsarray/-/argsarray-0.0.1.tgz",
-      "integrity": "sha512-u96dg2GcAKtpTrBdDoFIM7PjcBA+6rSP0OR94MOReNRyUECL6MtQt5XXmRr4qrftYaef9+l5hcpO5te7sML1Cg==",
-      "peer": true
-    },
     "node_modules/array-buffer-byte-length": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/array-buffer-byte-length/-/array-buffer-byte-length-1.0.2.tgz",
       "integrity": "sha512-LHE+8BuR7RYGDKvnrmcuSq3tDcKv9OFEXQt/HpbZhY7V6h0zlUXutnAD82GiFx9rdieCMjkvtcsPqBwgUl1Iiw==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "is-array-buffer": "^3.0.5"
@@ -6125,11 +5501,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/array-flatten": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/array-flatten/-/array-flatten-1.1.1.tgz",
-      "integrity": "sha512-PCVAQswWemu6UdxsDFFX/+gVeYqKAod3D3UVm91jHwynguOwAvYPhx8nNlM++NqRcK6CxxpUafjmhIdKiHibqg=="
-    },
     "node_modules/array-includes": {
       "version": "3.1.8",
       "resolved": "https://registry.npmjs.org/array-includes/-/array-includes-3.1.8.tgz",
@@ -6158,14 +5529,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/array-uniq": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/array-uniq/-/array-uniq-1.0.3.tgz",
-      "integrity": "sha512-MNha4BWQ6JbwhFhj03YK552f7cb3AzoE8SzeljgChvL1dl3IcvggXVz1DilzySZkCja+CXuZbdW7yATchWn8/Q==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/array.prototype.findlast": {
       "version": "1.2.5",
       "resolved": "https://registry.npmjs.org/array.prototype.findlast/-/array.prototype.findlast-1.2.5.tgz",
@@ -6242,6 +5605,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/arraybuffer.prototype.slice/-/arraybuffer.prototype.slice-1.0.4.tgz",
       "integrity": "sha512-BNoCY6SXXPQ7gF2opIP4GBE+Xw7U+pHMYKuzjgCN3GwiaIR09UUeKfheyIry77QtrCBlC0KK0q5/TER/tYh3PQ==",
+      "dev": true,
       "dependencies": {
         "array-buffer-byte-length": "^1.0.1",
         "call-bind": "^1.0.8",
@@ -6263,15 +5627,6 @@
       "resolved": "https://registry.npmjs.org/asap/-/asap-2.0.6.tgz",
       "integrity": "sha512-BSHWgDSAiKs50o2Re8ppvp3seVHXSRM44cdSsT9FfNEUUZLOGWVCsiWaRPWM1Znn+mqZ1OfVZ3z3DWEzSp7hRA=="
     },
-    "node_modules/assert": {
-      "version": "1.5.1",
-      "resolved": "https://registry.npmjs.org/assert/-/assert-1.5.1.tgz",
-      "integrity": "sha512-zzw1uCAgLbsKwBfFc8CX78DDg+xZeBksSO3vwVIDDN5i94eOrPsSSyiVhmsSABFDM/OcpE2aagCat9dnWQLG1A==",
-      "dependencies": {
-        "object.assign": "^4.1.4",
-        "util": "^0.10.4"
-      }
-    },
     "node_modules/ast-types": {
       "version": "0.15.2",
       "resolved": "https://registry.npmjs.org/ast-types/-/ast-types-0.15.2.tgz",
@@ -6287,6 +5642,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/async-function/-/async-function-1.0.0.tgz",
       "integrity": "sha512-hsU18Ae8CDTR6Kgu9DYf0EbCr/a5iGL0rytQDobUcdpYOKokk8LEjVphnXkDkgpi0wYVsqrXuP0bZxJaTqdgoA==",
+      "dev": true,
       "engines": {
         "node": ">= 0.4"
       }
@@ -6301,19 +5657,6 @@
       "resolved": "https://registry.npmjs.org/asynckit/-/asynckit-0.4.0.tgz",
       "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q=="
     },
-    "node_modules/asyncstorage-down": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/asyncstorage-down/-/asyncstorage-down-4.2.0.tgz",
-      "integrity": "sha512-xTljBjicpnxsoA7yEs6duXFXWEZC0V1Q/PeKcUM7Cd2k2W1XPGfyBY1kPXBxTqR++u6ZuDa5egnU8/E/WkJv4Q==",
-      "peer": true,
-      "dependencies": {
-        "abstract-leveldown": "2.6.1",
-        "argsarray": "0.0.1",
-        "d64": "^1.0.0",
-        "ltgt": "^2.1.3",
-        "tiny-queue": "0.2.0"
-      }
-    },
     "node_modules/at-least-node": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/at-least-node/-/at-least-node-1.0.0.tgz",
@@ -6326,6 +5669,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/available-typed-arrays/-/available-typed-arrays-1.0.7.tgz",
       "integrity": "sha512-wvUjBtSGN7+7SjNpq/9M2Tg350UZD3q62IFZLbRAR1bSMlCo1ZaeW+BJ+D090e4hIIZLBcTDWe4Mh4jvUDajzQ==",
+      "dev": true,
       "dependencies": {
         "possible-typed-array-names": "^1.0.0"
       },
@@ -6388,130 +5732,6 @@
         "@babel/core": "^7.8.0"
       }
     },
-    "node_modules/babel-loader": {
-      "version": "8.4.1",
-      "resolved": "https://registry.npmjs.org/babel-loader/-/babel-loader-8.4.1.tgz",
-      "integrity": "sha512-nXzRChX+Z1GoE6yWavBQg6jDslyFF3SDjl2paADuoQtQW10JqShJt62R6eJQ5m/pjJFDT8xgKIWSP85OY8eXeA==",
-      "dependencies": {
-        "find-cache-dir": "^3.3.1",
-        "loader-utils": "^2.0.4",
-        "make-dir": "^3.1.0",
-        "schema-utils": "^2.6.5"
-      },
-      "engines": {
-        "node": ">= 8.9"
-      },
-      "peerDependencies": {
-        "@babel/core": "^7.0.0",
-        "webpack": ">=2"
-      }
-    },
-    "node_modules/babel-loader/node_modules/find-cache-dir": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-3.3.2.tgz",
-      "integrity": "sha512-wXZV5emFEjrridIgED11OoUKLxiYjAcqot/NJdAkOhlJ+vGzwhOAfcG5OX1jP+S0PcjEn8bdMJv+g2jwQ3Onig==",
-      "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^3.0.2",
-        "pkg-dir": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/avajs/find-cache-dir?sponsor=1"
-      }
-    },
-    "node_modules/babel-loader/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/make-dir": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-3.1.0.tgz",
-      "integrity": "sha512-g3FeP20LNwhALb/6Cz6Dd4F2ngze0jz7tbzrD2wAV+o9FeNHe4rL+yK2md0J/fiSf1sa1ADhXqi5+oVwOM/eGw==",
-      "dependencies": {
-        "semver": "^6.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/babel-loader/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/babel-loader/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/babel-loader/node_modules/schema-utils": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/schema-utils/-/schema-utils-2.7.1.tgz",
-      "integrity": "sha512-SHiNtMOUGWBQJwzISiVYKu82GiV4QYGePp3odlY1tuKO7gPtphAT5R/py0fA6xtbgLL/RvtJZnU9b8s0F1q0Xg==",
-      "dependencies": {
-        "@types/json-schema": "^7.0.5",
-        "ajv": "^6.12.4",
-        "ajv-keywords": "^3.5.2"
-      },
-      "engines": {
-        "node": ">= 8.9.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      }
-    },
     "node_modules/babel-plugin-istanbul": {
       "version": "6.1.1",
       "resolved": "https://registry.npmjs.org/babel-plugin-istanbul/-/babel-plugin-istanbul-6.1.1.tgz",
@@ -6785,16 +6005,6 @@
       "resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
       "integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
     },
-    "node_modules/base-64": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/base-64/-/base-64-0.1.0.tgz",
-      "integrity": "sha512-Y5gU45svrR5tI2Vt/X9GPd3L0HNIKzGu202EjxrXMpuc2V2CiKgemAbUUsqYmZJvPtCXoUKjNZwBJzsNScUbXA=="
-    },
-    "node_modules/Base64": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/Base64/-/Base64-0.2.1.tgz",
-      "integrity": "sha512-reGEWshDmTDQDsCec/HduOO9Wyj6yMOupMfhIf3ugN1TDlK2NQW4DDJSqNNtp380SNcvRfXtO8HSCQot0d0SMw=="
-    },
     "node_modules/base64-js": {
       "version": "1.5.1",
       "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-1.5.1.tgz",
@@ -6814,11 +6024,6 @@
         }
       ]
     },
-    "node_modules/batch": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/batch/-/batch-0.6.1.tgz",
-      "integrity": "sha512-x+VAiMRL6UPkx+kudNvxTl6hB2XNNCG2r+7wixVfIYwu/2HKRXimwQyaumLjMveWvT2Hkd/cAJw+QBMfJ/EKVw=="
-    },
     "node_modules/better-opn": {
       "version": "3.0.2",
       "resolved": "https://registry.npmjs.org/better-opn/-/better-opn-3.0.2.tgz",
@@ -6854,14 +6059,6 @@
         "node": ">=0.6"
       }
     },
-    "node_modules/big.js": {
-      "version": "5.2.2",
-      "resolved": "https://registry.npmjs.org/big.js/-/big.js-5.2.2.tgz",
-      "integrity": "sha512-vyL2OymJxmarO8gxMr0mhChsO9QGwhynfuu4+MHTAW6czfq9humCB7rKpUjDd9YUiDPU4mzpyupFSvOClAwbmQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
     "node_modules/binary-extensions": {
       "version": "2.3.0",
       "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.3.0.tgz",
@@ -6873,103 +6070,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/bl": {
-      "version": "0.8.2",
-      "resolved": "https://registry.npmjs.org/bl/-/bl-0.8.2.tgz",
-      "integrity": "sha512-pfqikmByp+lifZCS0p6j6KreV6kNU6Apzpm2nKOk+94cZb/jvle55+JxWiByUQ0Wo/+XnDXEy5MxxKMb6r0VIw==",
-      "dependencies": {
-        "readable-stream": "~1.0.26"
-      }
-    },
-    "node_modules/bl/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
-    "node_modules/bl/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/blueimp-md5": {
-      "version": "2.19.0",
-      "resolved": "https://registry.npmjs.org/blueimp-md5/-/blueimp-md5-2.19.0.tgz",
-      "integrity": "sha512-DRQrD6gJyy8FbiE4s+bDoXS9hiW3Vbx5uCdwvcCf3zLHL+Iv7LtGHLpr+GZV8rHG8tK766FGYBwRbu8pELTt+w==",
-      "peer": true
-    },
-    "node_modules/body-parser": {
-      "version": "1.20.3",
-      "resolved": "https://registry.npmjs.org/body-parser/-/body-parser-1.20.3.tgz",
-      "integrity": "sha512-7rAxByjUMqQ3/bHJy7D6OGXvx/MMc4IqBn/X0fcM1QUcAItpZrBEYhWGem+tzXH90c+G01ypMcYJBO9Y30203g==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "content-type": "~1.0.5",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "on-finished": "2.4.1",
-        "qs": "6.13.0",
-        "raw-body": "2.5.2",
-        "type-is": "~1.6.18",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
-    },
-    "node_modules/body-parser/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/body-parser/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/body-parser/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "dependencies": {
-        "ee-first": "1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/bonjour-service": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/bonjour-service/-/bonjour-service-1.3.0.tgz",
-      "integrity": "sha512-3YuAUiSkWykd+2Azjgyxei8OWf8thdn8AITIog2M4UICzoqfjlqr64WIjEXZllf/W6vK1goqleSR6brGomxQqA==",
-      "dependencies": {
-        "fast-deep-equal": "^3.1.3",
-        "multicast-dns": "^7.2.5"
-      }
-    },
     "node_modules/boolbase": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/boolbase/-/boolbase-1.0.0.tgz",
@@ -7014,14 +6114,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/browserify-zlib": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/browserify-zlib/-/browserify-zlib-0.1.4.tgz",
-      "integrity": "sha512-19OEpq7vWgsH6WkvkBJQDFvJS1uPcbFOQ4v9CU839dO+ZZXUZO6XpE6hNCqvlIIj+4fZvRiJ6DsAQ382GwiyTQ==",
-      "dependencies": {
-        "pako": "~0.2.0"
-      }
-    },
     "node_modules/browserslist": {
       "version": "4.24.4",
       "resolved": "https://registry.npmjs.org/browserslist/-/browserslist-4.24.4.tgz",
@@ -7108,12 +6200,6 @@
       "resolved": "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.2.tgz",
       "integrity": "sha512-E+XQCRwSbaaiChtv6k6Dwgc+bx+Bs6vuKJHHl5kox/BaKbhiXzqQOwK4cO22yElGp2OCmjwVhT3HmxgyPGnJfQ=="
     },
-    "node_modules/builtins": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/builtins/-/builtins-1.0.3.tgz",
-      "integrity": "sha512-uYBjakWipfaO/bXI7E8rq6kpwHRZK5cNYrUv2OzZSI/FvmdMyXJ2tG9dKcjEC5YHmHpUAwsargWIZNWdxb/bnQ==",
-      "peer": true
-    },
     "node_modules/bytes": {
       "version": "3.1.2",
       "resolved": "https://registry.npmjs.org/bytes/-/bytes-3.1.2.tgz",
@@ -7153,6 +6239,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/call-bind/-/call-bind-1.0.8.tgz",
       "integrity": "sha512-oKlSFMcMwpUg2ednkhQ454wfWiU/ul3CkJe/PEHcTKuiX6RpbehUiFMXu13HalGZxfUwCQzZG747YXBn1im9ww==",
+      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.0",
         "es-define-property": "^1.0.0",
@@ -7182,6 +6269,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/call-bound/-/call-bound-1.0.3.tgz",
       "integrity": "sha512-YTd+6wGlNlPxSuri7Y6X8tY2dmm12UMH66RpKMhiX6rsk5wXXnYgbUcOt8kiS31/AjfoTOvCsE+w8nZQLQnzHA==",
+      "dev": true,
       "dependencies": {
         "call-bind-apply-helpers": "^1.0.1",
         "get-intrinsic": "^1.2.6"
@@ -7223,15 +6311,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/camel-case": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/camel-case/-/camel-case-4.1.2.tgz",
-      "integrity": "sha512-gxGWBrTT1JuMx6R+o5PTXMmUnhnVzLQ9SNutD4YqKtI6ap897t3tKECYla6gCWEkplXnlNybEkZg9GEGxKFCgw==",
-      "dependencies": {
-        "pascal-case": "^3.1.2",
-        "tslib": "^2.0.3"
-      }
-    },
     "node_modules/camelcase": {
       "version": "5.3.1",
       "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-5.3.1.tgz",
@@ -7248,17 +6327,6 @@
         "node": ">= 6"
       }
     },
-    "node_modules/caniuse-api": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/caniuse-api/-/caniuse-api-3.0.0.tgz",
-      "integrity": "sha512-bsTwuIg/BZZK/vreVTYYbSWoe2F+71P7K5QGEX+pT250DZbfU1MQ5prOKpPR+LL6uWKK3KMwMCAS74QB3Um1uw==",
-      "dependencies": {
-        "browserslist": "^4.0.0",
-        "caniuse-lite": "^1.0.0",
-        "lodash.memoize": "^4.1.2",
-        "lodash.uniq": "^4.5.0"
-      }
-    },
     "node_modules/caniuse-lite": {
       "version": "1.0.30001700",
       "resolved": "https://registry.npmjs.org/caniuse-lite/-/caniuse-lite-1.0.30001700.tgz",
@@ -7361,6 +6429,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/chrome-trace-event/-/chrome-trace-event-1.0.4.tgz",
       "integrity": "sha512-rNjApaLzuwaOTjCiT8lSDdGN1APCiqkChLMJxJPWLunPAt5fy8xgU9/jNOchV84wfIxrA0lRQB7oCT8jrn/wrQ==",
+      "peer": true,
       "engines": {
         "node": ">=6.0"
       }
@@ -7408,25 +6477,6 @@
       "resolved": "https://registry.npmjs.org/cjs-module-lexer/-/cjs-module-lexer-1.4.3.tgz",
       "integrity": "sha512-9z8TZaGM1pfswYeXrUpzPrkx8UnWYdhJclsiYMm6x/w5+nN+8Tf/LnAgfLGQCm59qAOxU8WwHEq2vNwF6i4j+Q=="
     },
-    "node_modules/clean-css": {
-      "version": "5.3.3",
-      "resolved": "https://registry.npmjs.org/clean-css/-/clean-css-5.3.3.tgz",
-      "integrity": "sha512-D5J+kHaVb/wKSFcyyV75uCn8fiY4sV38XJoe4CUyGQ+mOU/fMVYUdH1hJC+CJQ5uY3EnW27SbJYS4X8BiLrAFg==",
-      "dependencies": {
-        "source-map": "~0.6.0"
-      },
-      "engines": {
-        "node": ">= 10.0"
-      }
-    },
-    "node_modules/clean-css/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/clean-stack": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/clean-stack/-/clean-stack-2.2.0.tgz",
@@ -7435,111 +6485,6 @@
         "node": ">=6"
       }
     },
-    "node_modules/clean-webpack-plugin": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/clean-webpack-plugin/-/clean-webpack-plugin-4.0.0.tgz",
-      "integrity": "sha512-WuWE1nyTNAyW5T7oNyys2EN0cfP2fdRxhxnIQWiAp0bMabPdHhoGxM8A6YL2GhqwgrPnnaemVE7nv5XJ2Fhh2w==",
-      "dependencies": {
-        "del": "^4.1.1"
-      },
-      "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "webpack": ">=4.0.0 <6.0.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/array-union": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-1.0.2.tgz",
-      "integrity": "sha512-Dxr6QJj/RdU/hCaBjOfxW+q6lyuVE6JFWIrAUpuOOhoJJoQ99cUn3igRaHVB5P9WrgFVN0FfArM3x0cueOU8ng==",
-      "dependencies": {
-        "array-uniq": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/del": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
-      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
-      "dependencies": {
-        "@types/glob": "^7.1.1",
-        "globby": "^6.1.0",
-        "is-path-cwd": "^2.0.0",
-        "is-path-in-cwd": "^2.0.0",
-        "p-map": "^2.0.0",
-        "pify": "^4.0.1",
-        "rimraf": "^2.6.3"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/globby": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-6.1.0.tgz",
-      "integrity": "sha512-KVbFv2TQtbzCoxAnfD6JcHZTYCzyliEaaeM/gH8qQdkKr5s0OP9scEgvdcngyk7AVdY6YVW/TJHd+lQ/Df3Daw==",
-      "dependencies": {
-        "array-union": "^1.0.1",
-        "glob": "^7.0.3",
-        "object-assign": "^4.0.1",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/globby/node_modules/pify": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-      "integrity": "sha512-udgsAY+fTnvv7kI7aaxbqwWNb0AHiB0qBO89PZKPkoTmGOgdbrHDKD+0B2X4uTfJ/FT1R09r9gTsjUjNJotuog==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/p-map": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
-      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/clean-webpack-plugin/node_modules/rimraf": {
-      "version": "2.7.1",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.7.1.tgz",
-      "integrity": "sha512-uWjbaKIK3T1OSVptzX7Nl6PvQ3qAGtKEtVRjRuazjfL3Bx5eI409VZSqgND+4UNnmzLVdPj9FqFJNPqBZFve4w==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "dependencies": {
-        "glob": "^7.1.3"
-      },
-      "bin": {
-        "rimraf": "bin.js"
-      }
-    },
     "node_modules/cli-cursor": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/cli-cursor/-/cli-cursor-2.1.0.tgz",
@@ -7631,8833 +6576,5070 @@
         "node": ">=6"
       }
     },
-    "node_modules/cloudinary-react-native": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/cloudinary-react-native/-/cloudinary-react-native-1.0.1.tgz",
-      "integrity": "sha512-itywsta5Yy8R4BL82HsyxBS1YDly58nOdQFo5ZVZtnWi7gzwxNw2Ts+07RWPa1qdW4CzK0vCqTDELuaERmzvUA==",
-      "dependencies": {
-        "@cloudinary/url-gen": "^1.10.0",
-        "@expo/webpack-config": "^18.0.1",
-        "@tradle/react-native-http": "^2.0.1",
-        "assert": "^1.5.0",
-        "browserify-zlib": "^0.1.4",
-        "console-browserify": "^1.2.0",
-        "constants-browserify": "^1.0.0",
-        "dns.js": "^1.0.1",
-        "domain-browser": "^1.2.0",
-        "events": "^1.1.1",
-        "expo-asset": "^10.0.6",
-        "expo-av": "^14.0.5",
-        "expo-crypto": "^13.0.2",
-        "https-browserify": "^0.0.1",
-        "isomorphic-fetch": "^3.0.0",
-        "path-browserify": "^0.0.0",
-        "process": "^0.11.10",
-        "punycode": "^1.4.1",
-        "querystring-es3": "^0.2.1",
-        "react-dom": "18.0.0",
-        "react-native-fs": "^2.20.0",
-        "react-native-level-fs": "^3.0.1",
-        "react-native-os": "^1.2.6",
-        "react-native-tcp": "^3.3.2",
-        "react-native-udp": "^2.7.0",
-        "react-native-url-polyfill": "^1.3.0",
-        "react-native-web": "~0.19.6",
-        "readable-stream": "^1.0.33",
-        "stream-browserify": "^1.0.0",
-        "string_decoder": "^0.10.31",
-        "timers-browserify": "^1.4.2",
-        "tty-browserify": "^0.0.0",
-        "url": "^0.10.3",
-        "util": "^0.10.4",
-        "vm-browserify": "^0.0.4"
-      },
-      "engines": {
-        "node": ">= 22.0.0"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+    "node_modules/co": {
+      "version": "4.6.0",
+      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
+      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+      "engines": {
+        "iojs": ">= 1.0.0",
+        "node": ">= 0.12.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@babel/code-frame": {
-      "version": "7.10.4",
-      "resolved": "https://registry.npmjs.org/@babel/code-frame/-/code-frame-7.10.4.tgz",
-      "integrity": "sha512-vG6SvB6oYEhvgisZNFRmRCUkLz11c7rp+tbNTynGqc6mS1d5ATd/sGyV6W0KZZnXRKMTzZDRgQT3Ou9jhpAfUg==",
-      "dependencies": {
-        "@babel/highlight": "^7.10.4"
-      }
+    "node_modules/collect-v8-coverage": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
+      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/cli": {
-      "version": "0.7.3",
-      "resolved": "https://registry.npmjs.org/@expo/cli/-/cli-0.7.3.tgz",
-      "integrity": "sha512-uMGHbAhApqXR2sd1KPhgvpbOhBBnspad8msEqHleT2PHXwKIwTUDzBGO9+jdOAWwCx2MJfw3+asYjzoD3DN9Bg==",
-      "peer": true,
+    "node_modules/color": {
+      "version": "4.2.3",
+      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
+      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
+      "license": "MIT",
       "dependencies": {
-        "@babel/runtime": "^7.20.0",
-        "@expo/code-signing-certificates": "0.0.5",
-        "@expo/config": "~8.0.0",
-        "@expo/config-plugins": "~6.0.0",
-        "@expo/dev-server": "0.3.0",
-        "@expo/devcert": "^1.0.0",
-        "@expo/json-file": "^8.2.37",
-        "@expo/metro-config": "~0.7.0",
-        "@expo/osascript": "^2.0.31",
-        "@expo/package-manager": "~1.0.0",
-        "@expo/plist": "^0.0.20",
-        "@expo/prebuild-config": "6.0.1",
-        "@expo/rudder-sdk-node": "1.1.1",
-        "@expo/spawn-async": "1.5.0",
-        "@expo/xcpretty": "^4.2.1",
-        "@urql/core": "2.3.6",
-        "@urql/exchange-retry": "0.3.0",
-        "accepts": "^1.3.8",
-        "arg": "4.1.0",
-        "better-opn": "~3.0.2",
-        "bplist-parser": "^0.3.1",
-        "cacache": "^15.3.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.3.0",
-        "debug": "^4.3.4",
-        "env-editor": "^0.4.1",
-        "form-data": "^3.0.1",
-        "freeport-async": "2.0.0",
-        "fs-extra": "~8.1.0",
-        "getenv": "^1.0.0",
-        "graphql": "15.8.0",
-        "graphql-tag": "^2.10.1",
-        "https-proxy-agent": "^5.0.1",
-        "internal-ip": "4.3.0",
-        "is-root": "^2.1.0",
-        "js-yaml": "^3.13.1",
-        "json-schema-deref-sync": "^0.13.0",
-        "md5-file": "^3.2.3",
-        "md5hex": "^1.0.0",
-        "minipass": "3.1.6",
-        "node-fetch": "^2.6.7",
-        "node-forge": "^1.3.1",
-        "npm-package-arg": "^7.0.0",
-        "ora": "3.4.0",
-        "pretty-bytes": "5.6.0",
-        "progress": "2.0.3",
-        "prompts": "^2.3.2",
-        "qrcode-terminal": "0.11.0",
-        "requireg": "^0.2.2",
-        "resolve-from": "^5.0.0",
-        "semver": "^6.3.0",
-        "send": "^0.18.0",
-        "slugify": "^1.3.4",
-        "structured-headers": "^0.4.1",
-        "tar": "^6.0.5",
-        "tempy": "^0.7.1",
-        "terminal-link": "^2.1.1",
-        "text-table": "^0.2.0",
-        "url-join": "4.0.0",
-        "wrap-ansi": "^7.0.0",
-        "ws": "^8.12.1"
+        "color-convert": "^2.0.1",
+        "color-string": "^1.9.0"
       },
-      "bin": {
-        "expo-internal": "build/bin/cli"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/@expo/cli/node_modules/semver": {
-      "version": "6.3.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-6.3.1.tgz",
-      "integrity": "sha512-BR7VvDCVHO+q2xBEWskxS6DJE1qRnb7DxzUrogb71CWoSficBxYsiAGd+Kl0mmq/MprG9yArRkyrQxTO6XjMzA==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
+      "engines": {
+        "node": ">=12.5.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/config": {
-      "version": "8.0.5",
-      "resolved": "https://registry.npmjs.org/@expo/config/-/config-8.0.5.tgz",
-      "integrity": "sha512-3CnLmtAQUWqLZwTRliS23QoFwdyhg4AWtp6gZ0qfcXthR84RvlZKcCDQQIyPiRUgu8dZa+gQDcdRJtgE+GM5XQ==",
-      "peer": true,
+    "node_modules/color-convert": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
+      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~6.0.0",
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "^8.2.37",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "require-from-string": "^2.0.2",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "slugify": "^1.3.4",
-        "sucrase": "^3.20.0"
+        "color-name": "~1.1.4"
+      },
+      "engines": {
+        "node": ">=7.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/config-plugins": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-6.0.2.tgz",
-      "integrity": "sha512-Cn01fXMHwjU042EgO9oO3Mna0o/UCrW91MQLMbJa4pXM41CYGjNgVy1EVXiuRRx/upegHhvltBw5D+JaUm8aZQ==",
-      "peer": true,
+    "node_modules/color-name": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
+      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    },
+    "node_modules/color-string": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
+      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
+      "license": "MIT",
       "dependencies": {
-        "@expo/config-types": "^48.0.0",
-        "@expo/json-file": "~8.2.37",
-        "@expo/plist": "^0.0.20",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "@react-native/normalize-color": "^2.0.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.3.5",
-        "slash": "^3.0.0",
-        "xcode": "^3.0.1",
-        "xml2js": "0.4.23"
+        "color-name": "^1.0.0",
+        "simple-swizzle": "^0.2.2"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/config-plugins/node_modules/@expo/json-file": {
-      "version": "8.2.37",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.2.37.tgz",
-      "integrity": "sha512-YaH6rVg11JoTS2P6LsW7ybS2CULjf40AbnAHw2F1eDPuheprNjARZMnyHFPkKv7GuxCy+B9GPcbOKgc4cgA80Q==",
-      "peer": true,
+    "node_modules/combined-stream": {
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
+      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
       "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
+        "delayed-stream": "~1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/config-types": {
-      "version": "48.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-48.0.0.tgz",
-      "integrity": "sha512-DwyV4jTy/+cLzXGAo1xftS6mVlSiLIWZjl9DjTCLPFVgNYQxnh7htPilRv4rBhiNs7KaznWqKU70+4zQoKVT9A==",
-      "peer": true
+    "node_modules/command-exists": {
+      "version": "1.2.9",
+      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
+      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/config/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/commander": {
+      "version": "7.2.0",
+      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
+      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
       "engines": {
-        "node": ">=10"
+        "node": ">= 10"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/env": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@expo/env/-/env-0.3.0.tgz",
-      "integrity": "sha512-OtB9XVHWaXidLbHvrVDeeXa09yvTl3+IQN884sO6PhIi2/StXfgSH/9zC7IvzrDB8kW3EBJ1PPLuCUJ2hxAT7Q==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "debug": "^4.3.4",
-        "dotenv": "~16.4.5",
-        "dotenv-expand": "~11.0.6",
-        "getenv": "^1.0.0"
-      }
+    "node_modules/commondir": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
+      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils": {
-      "version": "0.3.22",
-      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.22.tgz",
-      "integrity": "sha512-uzq+RERAtkWypOFOLssFnXXqEqKjNj9eXN7e97d/EXUAojNcLDoXc0sL+F5B1I4qtlsnhX01kcpoIBBZD8wZNQ==",
-      "peer": true,
-      "dependencies": {
-        "@expo/spawn-async": "1.5.0",
-        "chalk": "^4.0.0",
-        "fs-extra": "9.0.0",
-        "getenv": "^1.0.0",
-        "jimp-compact": "0.16.1",
-        "mime": "^2.4.4",
-        "node-fetch": "^2.6.0",
-        "parse-png": "^2.1.0",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "tempy": "0.3.0"
+    "node_modules/component-type": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
+      "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==",
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
-      "peer": true,
+    "node_modules/compressible": {
+      "version": "2.0.18",
+      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
+      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
+        "mime-db": ">= 1.43.0 < 2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "peer": true,
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/compression": {
+      "version": "1.8.0",
+      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
+      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+      "dependencies": {
+        "bytes": "3.1.2",
+        "compressible": "~2.0.18",
+        "debug": "2.6.9",
+        "negotiator": "~0.6.4",
+        "on-headers": "~1.0.2",
+        "safe-buffer": "5.2.1",
+        "vary": "~1.1.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/image-utils/node_modules/tempy": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz",
-      "integrity": "sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==",
-      "peer": true,
+    "node_modules/compression/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "temp-dir": "^1.0.0",
-        "type-fest": "^0.3.1",
-        "unique-string": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/json-file": {
-      "version": "8.3.3",
-      "resolved": "https://registry.npmjs.org/@expo/json-file/-/json-file-8.3.3.tgz",
-      "integrity": "sha512-eZ5dld9AD0PrVRiIWpRkm5aIoWBw3kAyd8VkuWEy92sEthBKDDDHAnK2a0dw0Eil6j7rK7lS/Qaq/Zzngv2h5A==",
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "json5": "^2.2.2",
-        "write-file-atomic": "^2.3.0"
+    "node_modules/compression/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/compression/node_modules/negotiator": {
+      "version": "0.6.4",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
+      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
+      "engines": {
+        "node": ">= 0.6"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/metro-config": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/@expo/metro-config/-/metro-config-0.7.1.tgz",
-      "integrity": "sha512-vGWU62Zp5pRGw5IEHDNdqvsy62/hu/Na7bswePYVjoaItOjJY7+qilFeF0AAK+3V8qAM8fpltH3ByylKfWaA7A==",
-      "peer": true,
+    "node_modules/concat-map": {
+      "version": "0.0.1",
+      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
+      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    },
+    "node_modules/connect": {
+      "version": "3.7.0",
+      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
+      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
       "dependencies": {
-        "@expo/config": "~8.0.0",
-        "chalk": "^4.1.0",
-        "debug": "^4.3.2",
-        "find-yarn-workspace-root": "~2.0.0",
-        "getenv": "^1.0.0",
-        "resolve-from": "^5.0.0",
-        "sucrase": "^3.20.0"
+        "debug": "2.6.9",
+        "finalhandler": "1.1.2",
+        "parseurl": "~1.3.3",
+        "utils-merge": "1.0.1"
+      },
+      "engines": {
+        "node": ">= 0.10.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/package-manager": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/@expo/package-manager/-/package-manager-1.0.3.tgz",
-      "integrity": "sha512-NpdwcRar22gJDDug3GEb62Ka6vy+Yi//3zTdYhdkzwekY6qzg7+vZCeEKayFJjvbCjjOPNSrauNR4zD+WJmRIQ==",
-      "peer": true,
+    "node_modules/connect/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "@expo/json-file": "^8.2.37",
-        "@expo/spawn-async": "^1.5.0",
-        "ansi-regex": "^5.0.0",
-        "chalk": "^4.0.0",
-        "find-up": "^5.0.0",
-        "find-yarn-workspace-root": "~2.0.0",
-        "js-yaml": "^3.13.1",
-        "micromatch": "^4.0.2",
-        "npm-package-arg": "^7.0.0",
-        "split": "^1.0.1",
-        "sudo-prompt": "9.1.1"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/plist": {
-      "version": "0.0.20",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.0.20.tgz",
-      "integrity": "sha512-UXQ4LXCfTZ580LDHGJ5q62jSTwJFFJ1GqBu8duQMThiHKWbMJ+gajJh6rsB6EJ3aLUr9wcauxneL5LVRFxwBEA==",
-      "peer": true,
-      "dependencies": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
+    "node_modules/connect/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/convert-source-map": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
+      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    },
+    "node_modules/core-js": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
+      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
+      "hasInstallScript": true,
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/@expo/prebuild-config/-/prebuild-config-6.0.1.tgz",
-      "integrity": "sha512-WK3FDht1tdXZGCvtG5s7HSwzhsc7Tyu2DdqV9jVUsLtGD42oqUepk13mEWlU9LOTBgLsoEueKjoSK4EXOXFctw==",
-      "peer": true,
+    "node_modules/core-js-compat": {
+      "version": "3.40.0",
+      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
+      "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
       "dependencies": {
-        "@expo/config": "~8.0.0",
-        "@expo/config-plugins": "~6.0.0",
-        "@expo/config-types": "^48.0.0",
-        "@expo/image-utils": "0.3.22",
-        "@expo/json-file": "^8.2.37",
-        "debug": "^4.3.1",
-        "fs-extra": "^9.0.0",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "xml2js": "0.4.23"
+        "browserslist": "^4.24.3"
       },
-      "peerDependencies": {
-        "expo-modules-autolinking": ">=0.8.1"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/core-js"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "peer": true,
+    "node_modules/cosmiconfig": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
+      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "import-fresh": "^2.0.0",
+        "is-directory": "^0.3.1",
+        "js-yaml": "^3.13.1",
+        "parse-json": "^4.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "peer": true,
+    "node_modules/create-jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
+      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "exit": "^0.1.2",
+        "graceful-fs": "^4.2.9",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "prompts": "^2.0.1"
+      },
       "bin": {
-        "semver": "bin/semver.js"
+        "create-jest": "bin/create-jest.js"
       },
       "engines": {
-        "node": ">=10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/prebuild-config/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
+    "node_modules/cross-fetch": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
+      "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
+      "dependencies": {
+        "node-fetch": "^2.7.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/spawn-async": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.5.0.tgz",
-      "integrity": "sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==",
-      "peer": true,
+    "node_modules/cross-spawn": {
+      "version": "7.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
+      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
       "dependencies": {
-        "cross-spawn": "^6.0.5"
+        "path-key": "^3.1.0",
+        "shebang-command": "^2.0.0",
+        "which": "^2.0.1"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@expo/vector-icons": {
-      "version": "13.0.0",
-      "resolved": "https://registry.npmjs.org/@expo/vector-icons/-/vector-icons-13.0.0.tgz",
-      "integrity": "sha512-TI+l71+5aSKnShYclFa14Kum+hQMZ86b95SH6tQUG3qZEmLTarvWpKwqtTwQKqvlJSJrpFiSFu3eCuZokY6zWA==",
-      "peer": true
-    },
-    "node_modules/cloudinary-react-native/node_modules/@expo/webpack-config": {
-      "version": "18.1.4",
-      "resolved": "https://registry.npmjs.org/@expo/webpack-config/-/webpack-config-18.1.4.tgz",
-      "integrity": "sha512-lc2ZvlsxI6vDH4RHA4xnYzDl4Dir5HTiFpw8WE28kE8+33pma/DIIycv5bE/BZx+czV5NqM4103E2TvgKkccKA==",
-      "dependencies": {
-        "@babel/core": "^7.20.2",
-        "babel-loader": "^8.3.0",
-        "chalk": "^4.0.0",
-        "clean-webpack-plugin": "^4.0.0",
-        "copy-webpack-plugin": "^10.2.0",
-        "css-loader": "^6.5.1",
-        "css-minimizer-webpack-plugin": "^3.4.1",
-        "expo-pwa": "0.0.126",
-        "find-up": "^5.0.0",
-        "find-yarn-workspace-root": "~2.0.0",
-        "getenv": "^1.0.0",
-        "html-webpack-plugin": "^5.5.0",
-        "is-wsl": "^2.0.0",
-        "mini-css-extract-plugin": "^2.5.2",
-        "node-html-parser": "^5.2.0",
-        "semver": "~7.3.2",
-        "source-map-loader": "^3.0.1",
-        "style-loader": "^3.3.1",
-        "terser-webpack-plugin": "^5.3.0",
-        "webpack": "^5.64.4",
-        "webpack-dev-server": "^4.11.1",
-        "webpack-manifest-plugin": "^4.1.1"
-      },
+    "node_modules/crypt": {
+      "version": "0.0.2",
+      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
+      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
       "engines": {
-        "node": ">=12"
-      },
-      "peerDependencies": {
-        "expo": "^48.0.17"
+        "node": "*"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@jest/types": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/@jest/types/-/types-26.6.2.tgz",
-      "integrity": "sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ==",
-      "peer": true,
-      "dependencies": {
-        "@types/istanbul-lib-coverage": "^2.0.0",
-        "@types/istanbul-reports": "^3.0.0",
-        "@types/node": "*",
-        "@types/yargs": "^15.0.0",
-        "chalk": "^4.0.0"
-      },
+    "node_modules/crypto-random-string": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
+      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
       "engines": {
-        "node": ">= 10.14.2"
+        "node": ">=8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@npmcli/fs": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/@npmcli/fs/-/fs-1.1.1.tgz",
-      "integrity": "sha512-8KG5RD0GVP4ydEzRn/I4BNDuxDtqVbOdm8675T49OIG/NGhaK0pjPX7ZcDlvKYbA+ulvVK3ztfcF4uBdOxuJbQ==",
+    "node_modules/css-in-js-utils": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz",
+      "integrity": "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==",
+      "optional": true,
       "peer": true,
       "dependencies": {
-        "@gar/promisify": "^1.0.1",
-        "semver": "^7.3.5"
+        "hyphenate-style-name": "^1.0.3"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@types/yargs": {
-      "version": "15.0.19",
-      "resolved": "https://registry.npmjs.org/@types/yargs/-/yargs-15.0.19.tgz",
-      "integrity": "sha512-2XUaGVmyQjgyAZldf0D0c14vvo/yv0MhQBSTJcejMMaitsn3nxCB6TmH4G0ZQf+uxROOa9mpanoSm8h6SG/1ZA==",
-      "peer": true,
+    "node_modules/css-select": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
+      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
       "dependencies": {
-        "@types/yargs-parser": "*"
+        "boolbase": "^1.0.0",
+        "css-what": "^6.1.0",
+        "domhandler": "^5.0.2",
+        "domutils": "^3.0.1",
+        "nth-check": "^2.0.1"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@urql/core": {
-      "version": "2.3.6",
-      "resolved": "https://registry.npmjs.org/@urql/core/-/core-2.3.6.tgz",
-      "integrity": "sha512-PUxhtBh7/8167HJK6WqBv6Z0piuiaZHQGYbhwpNL9aIQmLROPEdaUYkY4wh45wPQXcTpnd11l0q3Pw+TI11pdw==",
-      "peer": true,
+    "node_modules/css-tree": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
+      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
       "dependencies": {
-        "@graphql-typed-document-node/core": "^3.1.0",
-        "wonka": "^4.0.14"
+        "mdn-data": "2.0.14",
+        "source-map": "^0.6.1"
       },
-      "peerDependencies": {
-        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
+      "engines": {
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@urql/core/node_modules/@graphql-typed-document-node/core": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/@graphql-typed-document-node/core/-/core-3.2.0.tgz",
-      "integrity": "sha512-mB9oAsNCm9aM3/SOv4YtBMqZbYj10R7dkq8byBqxGY/ncFwhf2oQzMV+LCRlWoDSEBJ3COiR1yeDvMtsoOsuFQ==",
-      "peer": true,
-      "peerDependencies": {
-        "graphql": "^0.8.0 || ^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0 || ^17.0.0"
+    "node_modules/css-tree/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/@urql/exchange-retry": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/@urql/exchange-retry/-/exchange-retry-0.3.0.tgz",
-      "integrity": "sha512-hHqer2mcdVC0eYnVNbWyi28AlGOPb2vjH3lP3/Bc8Lc8BjhMsDwFMm7WhoP5C1+cfbr/QJ6Er3H/L08wznXxfg==",
-      "peer": true,
-      "dependencies": {
-        "@urql/core": ">=2.3.1",
-        "wonka": "^4.0.14"
+    "node_modules/css-what": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
+      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
+      "engines": {
+        "node": ">= 6"
       },
-      "peerDependencies": {
-        "graphql": "^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0"
+      "funding": {
+        "url": "https://github.com/sponsors/fb55"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/arg": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
-      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
-      "peer": true
-    },
-    "node_modules/cloudinary-react-native/node_modules/babel-plugin-module-resolver": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/babel-plugin-module-resolver/-/babel-plugin-module-resolver-4.1.0.tgz",
-      "integrity": "sha512-MlX10UDheRr3lb3P0WcaIdtCSRlxdQsB1sBqL7W0raF070bGl1HQQq5K3T2vf2XAYie+ww+5AKC/WrkjRO2knA==",
-      "peer": true,
-      "dependencies": {
-        "find-babel-config": "^1.2.0",
-        "glob": "^7.1.6",
-        "pkg-up": "^3.1.0",
-        "reselect": "^4.0.0",
-        "resolve": "^1.13.1"
+    "node_modules/cssesc": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
+      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
+      "bin": {
+        "cssesc": "bin/cssesc"
       },
       "engines": {
-        "node": ">= 8.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/babel-plugin-react-native-web": {
-      "version": "0.18.12",
-      "resolved": "https://registry.npmjs.org/babel-plugin-react-native-web/-/babel-plugin-react-native-web-0.18.12.tgz",
-      "integrity": "sha512-4djr9G6fMdwQoD6LQ7hOKAm39+y12flWgovAqS1k5O8f42YQ3A1FFMyV5kKfetZuGhZO5BmNmOdRRZQ1TixtDw==",
-      "peer": true
-    },
-    "node_modules/cloudinary-react-native/node_modules/babel-preset-expo": {
-      "version": "9.3.2",
-      "resolved": "https://registry.npmjs.org/babel-preset-expo/-/babel-preset-expo-9.3.2.tgz",
-      "integrity": "sha512-BjyvjwjJG0MaaDBLP/esbXRrAItM76po9L9zfnLxeqgFsHCIPmD+6ir45coDLGAXwR8m9It3G1yqYM9JPyemsQ==",
-      "peer": true,
-      "dependencies": {
-        "@babel/plugin-proposal-decorators": "^7.12.9",
-        "@babel/plugin-proposal-object-rest-spread": "^7.12.13",
-        "@babel/plugin-transform-react-jsx": "^7.12.17",
-        "@babel/preset-env": "^7.20.0",
-        "babel-plugin-module-resolver": "^4.1.0",
-        "babel-plugin-react-native-web": "~0.18.10",
-        "metro-react-native-babel-preset": "0.73.9"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/cacache": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz",
-      "integrity": "sha512-VVdYzXEn+cnbXpFgWs5hTT7OScegHVmLhJIR8Ufqk3iFD6A6j5iSX1KuBTfNEv4tdJWE2PzA6IVFtcLC7fN9wQ==",
-      "peer": true,
+    "node_modules/csso": {
+      "version": "5.0.5",
+      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
+      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "@npmcli/fs": "^1.0.0",
-        "@npmcli/move-file": "^1.0.1",
-        "chownr": "^2.0.0",
-        "fs-minipass": "^2.0.0",
-        "glob": "^7.1.4",
-        "infer-owner": "^1.0.4",
-        "lru-cache": "^6.0.0",
-        "minipass": "^3.1.1",
-        "minipass-collect": "^1.0.2",
-        "minipass-flush": "^1.0.5",
-        "minipass-pipeline": "^1.2.2",
-        "mkdirp": "^1.0.3",
-        "p-map": "^4.0.0",
-        "promise-inflight": "^1.0.1",
-        "rimraf": "^3.0.2",
-        "ssri": "^8.0.1",
-        "tar": "^6.0.2",
-        "unique-filename": "^1.1.1"
+        "css-tree": "~2.2.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
-      "peer": true,
+    "node_modules/csso/node_modules/css-tree": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
+      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "mdn-data": "2.0.28",
+        "source-map-js": "^1.0.1"
       },
       "engines": {
-        "node": ">=4.8"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/crypto-random-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-      "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
+        "npm": ">=7.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
+    "node_modules/csso/node_modules/mdn-data": {
+      "version": "2.0.28",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
+      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
+      "dev": true,
+      "license": "CC0-1.0"
     },
-    "node_modules/cloudinary-react-native/node_modules/expo": {
-      "version": "48.0.21",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-48.0.21.tgz",
-      "integrity": "sha512-Z211SC4wZP4Xd5/RBJhEw4uwSgpfzAvMh6IVdzwEVAJAcV1s48CACcSmIUe+7QJjEPzmb3T5Yo4EJ/JJXJ2o9A==",
-      "peer": true,
-      "dependencies": {
-        "@babel/runtime": "^7.20.0",
-        "@expo/cli": "0.7.3",
-        "@expo/config": "8.0.5",
-        "@expo/config-plugins": "6.0.2",
-        "@expo/vector-icons": "^13.0.0",
-        "babel-preset-expo": "~9.3.2",
-        "cross-spawn": "^6.0.5",
-        "expo-application": "~5.1.1",
-        "expo-asset": "~8.9.1",
-        "expo-constants": "~14.2.1",
-        "expo-file-system": "~15.2.2",
-        "expo-font": "~11.1.1",
-        "expo-keep-awake": "~12.0.1",
-        "expo-modules-autolinking": "1.2.0",
-        "expo-modules-core": "1.2.7",
-        "fbemitter": "^3.0.0",
-        "getenv": "^1.0.0",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3",
-        "node-fetch": "^2.6.7",
-        "pretty-format": "^26.5.2",
-        "uuid": "^3.4.0"
-      },
-      "bin": {
-        "expo": "bin/cli.js"
-      }
+    "node_modules/cssom": {
+      "version": "0.5.0",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
+      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset": {
-      "version": "10.0.10",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-10.0.10.tgz",
-      "integrity": "sha512-0qoTIihB79k+wGus9wy0JMKq7DdenziVx3iUkGvMAy2azscSgWH6bd2gJ9CGnhC6JRd3qTMFBL0ou/fx7WZl7A==",
+    "node_modules/cssstyle": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
+      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
       "dependencies": {
-        "expo-constants": "~16.0.0",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3"
+        "cssom": "~0.3.6"
       },
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config": {
-      "version": "9.0.4",
-      "resolved": "https://registry.npmjs.org/@expo/config/-/config-9.0.4.tgz",
-      "integrity": "sha512-g5ns5u1JSKudHYhjo1zaSfkJ/iZIcWmUmIQptMJZ6ag1C0ShL2sj8qdfU8MmAMuKLOgcIfSaiWlQnm4X3VJVkg==",
-      "dependencies": {
-        "@babel/code-frame": "~7.10.4",
-        "@expo/config-plugins": "~8.0.8",
-        "@expo/config-types": "^51.0.3",
-        "@expo/json-file": "^8.3.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "require-from-string": "^2.0.2",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.6.0",
-        "slugify": "^1.3.4",
-        "sucrase": "3.34.0"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config-plugins": {
-      "version": "8.0.11",
-      "resolved": "https://registry.npmjs.org/@expo/config-plugins/-/config-plugins-8.0.11.tgz",
-      "integrity": "sha512-oALE1HwnLFthrobAcC9ocnR9KXLzfWEjgIe4CPe+rDsfC6GDs8dGYCXfRFoCEzoLN4TGYs9RdZ8r0KoCcNrm2A==",
-      "dependencies": {
-        "@expo/config-types": "^51.0.3",
-        "@expo/json-file": "~8.3.0",
-        "@expo/plist": "^0.1.0",
-        "@expo/sdk-runtime-versions": "^1.0.0",
-        "chalk": "^4.1.2",
-        "debug": "^4.3.1",
-        "find-up": "~5.0.0",
-        "getenv": "^1.0.0",
-        "glob": "7.1.6",
-        "resolve-from": "^5.0.0",
-        "semver": "^7.5.4",
-        "slash": "^3.0.0",
-        "slugify": "^1.6.6",
-        "xcode": "^3.0.1",
-        "xml2js": "0.6.0"
-      }
+    "node_modules/cssstyle/node_modules/cssom": {
+      "version": "0.3.8",
+      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
+      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/config-types": {
-      "version": "51.0.3",
-      "resolved": "https://registry.npmjs.org/@expo/config-types/-/config-types-51.0.3.tgz",
-      "integrity": "sha512-hMfuq++b8VySb+m9uNNrlpbvGxYc8OcFCUX9yTmi9tlx6A4k8SDabWFBgmnr4ao3wEArvWrtUQIfQCVtPRdpKA=="
+    "node_modules/csstype": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
+      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
+      "devOptional": true
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/@expo/plist": {
-      "version": "0.1.3",
-      "resolved": "https://registry.npmjs.org/@expo/plist/-/plist-0.1.3.tgz",
-      "integrity": "sha512-GW/7hVlAylYg1tUrEASclw1MMk9FP4ZwyFAY/SUTJIhPDQHtfOlXREyWV3hhrHdX/K+pS73GNgdfT6E/e+kBbg==",
+    "node_modules/data-urls": {
+      "version": "3.0.2",
+      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
+      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
       "dependencies": {
-        "@xmldom/xmldom": "~0.7.7",
-        "base64-js": "^1.2.3",
-        "xmlbuilder": "^14.0.0"
+        "abab": "^2.0.6",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0"
+      },
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/expo-constants": {
-      "version": "16.0.2",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-16.0.2.tgz",
-      "integrity": "sha512-9tNY3OVO0jfiMzl7ngb6IOyR5VFzNoN5OOazUWoeGfmMqVB5kltTemRvKraK9JRbBKIw+SOYLEmF0sEqgFZ6OQ==",
+    "node_modules/data-urls/node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
       "dependencies": {
-        "@expo/config": "~9.0.0",
-        "@expo/env": "~0.3.0"
+        "punycode": "^2.1.1"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=12"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/data-urls/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/xml2js": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.6.0.tgz",
-      "integrity": "sha512-eLTh0kA8uHceqesPqSE+VvO1CDDJWMwlQfB6LuN6T8w6MaDJ8Txm8P7s5cHD0miF0V+GGTZrDQfxPZQVsur33w==",
+    "node_modules/data-urls/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/expo-asset/node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "engines": {
-        "node": ">=4.0"
+        "node": ">=12"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-constants": {
-      "version": "14.2.1",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-14.2.1.tgz",
-      "integrity": "sha512-DD5u4QmBds2U7uYo409apV7nX+XjudARcgqe7S9aRFJ/6kyftmuxvk1DpaU4X42Av8z/tfKwEpuxl+vl7HHx/Q==",
-      "peer": true,
+    "node_modules/data-view-buffer": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
+      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+      "dev": true,
       "dependencies": {
-        "@expo/config": "~8.0.0",
-        "uuid": "^3.3.2"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-file-system": {
-      "version": "15.2.2",
-      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.2.2.tgz",
-      "integrity": "sha512-LFkOLcWwlmnjkURxZ3/0ukS35OswX8iuQknLHRHeyk8mUA8fpRPPelD/a1lS+yclqfqavMJmTXVKM1Nsq5XVMA==",
-      "peer": true,
+    "node_modules/data-view-byte-length": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
+      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
+      "dev": true,
       "dependencies": {
-        "uuid": "^3.4.0"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.2"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/inspect-js"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-font": {
-      "version": "11.1.1",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-11.1.1.tgz",
-      "integrity": "sha512-X+aICqYY69hiiDDtcNrjq8KutHrH2TrHuMqk0Rfq0P7hF6hMd+YefwLBNkvIrqrgmTAuqiLjMUwj2rHLqmgluw==",
-      "peer": true,
+    "node_modules/data-view-byte-offset": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
+      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+      "dev": true,
       "dependencies": {
-        "fontfaceobserver": "^2.1.0"
+        "call-bound": "^1.0.2",
+        "es-errors": "^1.3.0",
+        "is-data-view": "^1.0.1"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-keep-awake": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-12.0.1.tgz",
-      "integrity": "sha512-hqeCnb4033TyuZaXs93zTK7rjVJ3bywXATyMmKmKkLEsH2PKBAl/VmjlCOPQL/2Ncqz6aj7Wo//tjeJTARBD4g==",
-      "peer": true,
-      "peerDependencies": {
-        "expo": "*"
+    "node_modules/date-fns": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
+      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
+      "license": "MIT",
+      "funding": {
+        "type": "github",
+        "url": "https://github.com/sponsors/kossnocorp"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-1.2.0.tgz",
-      "integrity": "sha512-QOPh/iXykNDCAzUual1imSrn2aDakzCGUp2QmxVREr0llajXygroUWlT9sQXh1zKzbNp+a+i/xK375ZeBFiNJA==",
-      "peer": true,
+    "node_modules/debug": {
+      "version": "4.4.0",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
+      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
       "dependencies": {
-        "chalk": "^4.1.0",
-        "commander": "^7.2.0",
-        "fast-glob": "^3.2.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.1.0"
+        "ms": "^2.1.3"
       },
-      "bin": {
-        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
+      "engines": {
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
-      "peer": true,
-      "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
-      },
+    "node_modules/decimal.js": {
+      "version": "10.5.0",
+      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
+      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
+    },
+    "node_modules/decode-uri-component": {
+      "version": "0.2.2",
+      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
+      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+      "license": "MIT",
       "engines": {
-        "node": ">=10"
+        "node": ">=0.10"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-modules-autolinking/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "peer": true,
-      "engines": {
-        "node": ">= 10.0.0"
+    "node_modules/dedent": {
+      "version": "1.5.3",
+      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
+      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
+      "peerDependencies": {
+        "babel-plugin-macros": "^3.1.0"
+      },
+      "peerDependenciesMeta": {
+        "babel-plugin-macros": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo-modules-core": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-1.2.7.tgz",
-      "integrity": "sha512-sulqn2M8+tIdxi6QFkKppDEzbePAscgE2LEHocYoQOgHxJpeT7axE0Hkzc+81EeviQilZzGeFZMtNMGh3c9yJg==",
-      "peer": true,
-      "dependencies": {
-        "compare-versions": "^3.4.0",
-        "invariant": "^2.2.4"
+    "node_modules/deep-extend": {
+      "version": "0.6.0",
+      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
+      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
+      "engines": {
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset": {
-      "version": "8.9.2",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-8.9.2.tgz",
-      "integrity": "sha512-aHMaZkIG5/UoguINEHm2ln/KviU2m/yuryslnhCKR3KXRxiLnMhxmrONLGbknuNE0O1iCaprrl1w3y71u01Rpw==",
-      "peer": true,
-      "dependencies": {
-        "blueimp-md5": "^2.10.0",
-        "expo-constants": "~14.3.0",
-        "expo-file-system": "~15.3.0",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3",
-        "path-browserify": "^1.0.0",
-        "url-parse": "^1.5.9"
+    "node_modules/deep-is": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
+      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
+      "dev": true
+    },
+    "node_modules/deepmerge": {
+      "version": "4.3.1",
+      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
+      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset/node_modules/expo-constants": {
-      "version": "14.3.0",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-14.3.0.tgz",
-      "integrity": "sha512-O8b+mZlPXZGH4wLLd+jMihGD0ZSMJRSmSsmcG7T60jHU3Dw4yDIuzHM/wMoBoL1pxLIbEwvcwDj0w8c+Sn+1sQ==",
-      "peer": true,
+    "node_modules/default-gateway": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
+      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
       "dependencies": {
-        "@expo/config": "~8.0.0",
-        "uuid": "^3.3.2"
+        "execa": "^1.0.0",
+        "ip-regex": "^2.1.0"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/expo-asset/node_modules/expo-file-system": {
-      "version": "15.3.0",
-      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-15.3.0.tgz",
-      "integrity": "sha512-YUvNZzZJlF5TZM+FoRW9biJPB7qEgZbGYm8xJpqnxpj70FkFhwwoKiXVduZk+KVNiIs7d0q7e+Jdvmcr+Id3FQ==",
-      "peer": true,
+    "node_modules/defaults": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
+      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
       "dependencies": {
-        "uuid": "^3.4.0"
+        "clone": "^1.0.2"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/expo/node_modules/path-browserify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-1.0.1.tgz",
-      "integrity": "sha512-b7uo2UCUOYZcnF/3ID0lulOJi/bafxa1xPe7ZPsammBSpjSWQkjNxlt635YGS2MiR9GjvuXCtz2emr3jbsz98g==",
-      "peer": true
-    },
-    "node_modules/cloudinary-react-native/node_modules/find-babel-config": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-1.2.2.tgz",
-      "integrity": "sha512-oK59njMyw2y3yxto1BCfVK7MQp/OYf4FleHu0RgosH3riFJ1aOuo/7naLDLAObfrgn3ueFhw5sAT/cp0QuJI3Q==",
-      "peer": true,
+    "node_modules/define-data-property": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
+      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+      "dev": true,
       "dependencies": {
-        "json5": "^1.0.2",
-        "path-exists": "^3.0.0"
+        "es-define-property": "^1.0.0",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.0.1"
       },
       "engines": {
-        "node": ">=4.0.0"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/find-babel-config/node_modules/json5": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-1.0.2.tgz",
-      "integrity": "sha512-g1MWMLBiz8FKi1e4w0UyVL3w+iJceWAFBAaBnnGKOpNa5f8TLktkbre1+s6oICydWAm+HRUGTmI+//xv2hvXYA==",
-      "peer": true,
-      "dependencies": {
-        "minimist": "^1.2.0"
+        "node": ">= 0.4"
       },
-      "bin": {
-        "json5": "lib/cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/fs-minipass": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-2.1.0.tgz",
-      "integrity": "sha512-V/JgOLFCS+R6Vcq0slCuaeWEdNC3ouDlJMNIsacH2VtALiu9mV4LPrHc5cDl8k5aw6J8jwgWWpiTo5RYhmIzvg==",
-      "peer": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
+    "node_modules/define-lazy-prop": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
+      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/glob": {
-      "version": "7.1.6",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.1.6.tgz",
-      "integrity": "sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
+    "node_modules/define-properties": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
+      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+      "dev": true,
       "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.0.4",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "define-data-property": "^1.0.1",
+        "has-property-descriptors": "^1.0.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": "*"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/hosted-git-info": {
-      "version": "3.0.8",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-3.0.8.tgz",
-      "integrity": "sha512-aXpmwoOhRBrw6X3j0h5RloK4x1OzsxMPyxqIHyNfSe2pypkVTZFpEiRoSipPEPlMrh0HW/XsjkJ5WgnCirpNUw==",
-      "peer": true,
+    "node_modules/del": {
+      "version": "6.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
+      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
       "dependencies": {
-        "lru-cache": "^6.0.0"
+        "globby": "^11.0.1",
+        "graceful-fs": "^4.2.4",
+        "is-glob": "^4.0.1",
+        "is-path-cwd": "^2.2.0",
+        "is-path-inside": "^3.0.2",
+        "p-map": "^4.0.0",
+        "rimraf": "^3.0.2",
+        "slash": "^3.0.0"
       },
       "engines": {
         "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
-      "peer": true,
-      "dependencies": {
-        "universalify": "^2.0.0"
-      },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
+    "node_modules/delayed-stream": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
+      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
+      "engines": {
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/jsonfile/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
-      "peer": true,
+    "node_modules/depd": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
+      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/lru-cache": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
-      "integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+    "node_modules/destroy": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
+      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.8",
+        "npm": "1.2.8000 || >= 1.4.16"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/minipass": {
-      "version": "3.1.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.1.6.tgz",
-      "integrity": "sha512-rty5kpw9/z8SX9dmxblFA6edItUmwJgMeYDZRrwlIVN27i8gysGbznJwUggw2V/FVqFSDdWy040ZPS811DYAqQ==",
-      "peer": true,
-      "dependencies": {
-        "yallist": "^4.0.0"
+    "node_modules/detect-libc": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
+      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
+      "bin": {
+        "detect-libc": "bin/detect-libc.js"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=0.10"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/minipass-collect": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-1.0.2.tgz",
-      "integrity": "sha512-6T6lH0H8OG9kITm/Jm6tdooIbogG9e0tLgpY6mphXSm/A9u8Nq1ryBG+Qspiub9LjWlBPsPS3tWQ/Botq4FdxA==",
-      "peer": true,
-      "dependencies": {
-        "minipass": "^3.0.0"
-      },
+    "node_modules/detect-newline": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
+      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
       "engines": {
-        "node": ">= 8"
+        "node": ">=8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/mkdirp": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-1.0.4.tgz",
-      "integrity": "sha512-vVqVZQyf3WLx2Shd0qJ9xuvqgAyKPLAiqITEtqW0oIUjzo3PePDd6fW9iFz30ef7Ysp/oiWqbhszeGWW2T6Gzw==",
-      "peer": true,
-      "bin": {
-        "mkdirp": "bin/cmd.js"
-      },
+    "node_modules/didyoumean": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
+      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
+    },
+    "node_modules/diff-sequences": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
+      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
       "engines": {
-        "node": ">=10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/npm-package-arg": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-7.0.0.tgz",
-      "integrity": "sha512-xXxr8y5U0kl8dVkz2oK7yZjPBvqM2fwaO5l3Yg13p03v8+E3qQcD0JNhHzjL1vyGgxcKkD0cco+NLR72iuPk3g==",
-      "peer": true,
+    "node_modules/dir-glob": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
+      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
       "dependencies": {
-        "hosted-git-info": "^3.0.2",
-        "osenv": "^0.1.5",
-        "semver": "^5.6.0",
-        "validate-npm-package-name": "^3.0.0"
+        "path-type": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/npm-package-arg/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "peer": true,
-      "bin": {
-        "semver": "bin/semver"
-      }
+    "node_modules/dlv": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
+      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
     },
-    "node_modules/cloudinary-react-native/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
-      "peer": true,
+    "node_modules/doctrine": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
+      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+      "dev": true,
       "dependencies": {
-        "ee-first": "1.1.1"
+        "esutils": "^2.0.2"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=4"
+    "node_modules/dom-serializer": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
+      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+      "dependencies": {
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.2",
+        "entities": "^4.2.0"
+      },
+      "funding": {
+        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
-      "peer": true,
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/domelementtype": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
+      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fb55"
+        }
+      ]
     },
-    "node_modules/cloudinary-react-native/node_modules/pretty-format": {
-      "version": "26.6.2",
-      "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-26.6.2.tgz",
-      "integrity": "sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg==",
-      "peer": true,
+    "node_modules/domexception": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
+      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
+      "deprecated": "Use your platform's native DOMException instead",
       "dependencies": {
-        "@jest/types": "^26.6.2",
-        "ansi-regex": "^5.0.0",
-        "ansi-styles": "^4.0.0",
-        "react-is": "^17.0.1"
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">= 10"
+        "node": ">=12"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/punycode": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.4.1.tgz",
-      "integrity": "sha512-jmYNElW7yvO7TV33CjSmvSiE2yco3bV2czu/OzDKdMNVZQWfxCblURLhf+47syQRBntjfLdd/H0egrzIG+oaFQ=="
+    "node_modules/domexception/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+      "engines": {
+        "node": ">=12"
+      }
     },
-    "node_modules/cloudinary-react-native/node_modules/react-dom": {
-      "version": "18.0.0",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-18.0.0.tgz",
-      "integrity": "sha512-XqX7uzmFo0pUceWFCt7Gff6IyIMzFUn7QMZrbrQfGxtaxXZIcGQzoNpRLE3fQLnS4XzLLPMZX2T9TRcSrasicw==",
+    "node_modules/domhandler": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
+      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
       "dependencies": {
-        "loose-envify": "^1.1.0",
-        "scheduler": "^0.21.0"
+        "domelementtype": "^2.3.0"
       },
-      "peerDependencies": {
-        "react": "^18.0.0"
+      "engines": {
+        "node": ">= 4"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/domhandler?sponsor=1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/react-is": {
-      "version": "17.0.2",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-17.0.2.tgz",
-      "integrity": "sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w==",
-      "peer": true
-    },
-    "node_modules/cloudinary-react-native/node_modules/react-native-fs": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/react-native-fs/-/react-native-fs-2.20.0.tgz",
-      "integrity": "sha512-VkTBzs7fIDUiy/XajOSNk0XazFE9l+QlMAce7lGuebZcag5CnjszB+u4BdqzwaQOdcYb5wsJIsqq4kxInIRpJQ==",
+    "node_modules/domutils": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
+      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
       "dependencies": {
-        "base-64": "^0.1.0",
-        "utf8": "^3.0.0"
-      },
-      "peerDependencies": {
-        "react-native": "*",
-        "react-native-windows": "*"
+        "dom-serializer": "^2.0.0",
+        "domelementtype": "^2.3.0",
+        "domhandler": "^5.0.3"
       },
-      "peerDependenciesMeta": {
-        "react-native-windows": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/fb55/domutils?sponsor=1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/scheduler": {
-      "version": "0.21.0",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.21.0.tgz",
-      "integrity": "sha512-1r87x5fz9MXqswA2ERLo0EbOAU74DpIUO090gIasYTqlVoJeMcl+Z1Rg7WHz+qtPujhS/hGIt9kxZOYBV3faRQ==",
+    "node_modules/dot-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
+      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "loose-envify": "^1.1.0"
+        "no-case": "^3.0.4",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/semver": {
-      "version": "7.3.8",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.8.tgz",
-      "integrity": "sha512-NB1ctGL5rlHrPJtFDVIVzTyQylMLu9N9VICA6HSFJo8MCGVTMW6gfpicwKmmK/dAjTOrqu5l63JJOpDSrAis3A==",
-      "dependencies": {
-        "lru-cache": "^6.0.0"
-      },
-      "bin": {
-        "semver": "bin/semver.js"
-      },
+    "node_modules/dotenv": {
+      "version": "16.4.7",
+      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
+      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/send": {
-      "version": "0.18.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.18.0.tgz",
-      "integrity": "sha512-qqWzuOjSFOuqPjFe4NOsMLafToQQwBSOEpS+FwEt3A2V3vKubTquT3vmLTQpFgMXp8AlFWFuP1qKaJZOtPpVXg==",
-      "peer": true,
+    "node_modules/dotenv-expand": {
+      "version": "11.0.7",
+      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
+      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
       "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "dotenv": "^16.4.5"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://dotenvx.com"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/send/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "peer": true,
+    "node_modules/dunder-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
+      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
       "dependencies": {
-        "ms": "2.0.0"
+        "call-bind-apply-helpers": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "gopd": "^1.2.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/send/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A==",
-      "peer": true
+    "node_modules/eastasianwidth": {
+      "version": "0.2.0",
+      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
+      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
     },
-    "node_modules/cloudinary-react-native/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "peer": true,
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
+    "node_modules/ee-first": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
+      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    },
+    "node_modules/electron-to-chromium": {
+      "version": "1.5.103",
+      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
+      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA=="
+    },
+    "node_modules/emittery": {
+      "version": "0.13.1",
+      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
+      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=12"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "peer": true,
+    "node_modules/emoji-regex": {
+      "version": "9.2.2",
+      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
+      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
+    },
+    "node_modules/encodeurl": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
+      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/ssri": {
-      "version": "8.0.1",
-      "resolved": "https://registry.npmjs.org/ssri/-/ssri-8.0.1.tgz",
-      "integrity": "sha512-97qShzy1AiyxvPNIkLWoGua7xoQzzPjQ0HAH4B0rWKo7SZ6USuPcrUiAFrws0UH8RrbWmgq3LMTObhPIHbbBeQ==",
-      "peer": true,
+    "node_modules/end-of-stream": {
+      "version": "1.4.4",
+      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
+      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
       "dependencies": {
-        "minipass": "^3.1.1"
-      },
-      "engines": {
-        "node": ">= 8"
+        "once": "^1.4.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "peer": true,
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/engine.io-client": {
+      "version": "6.6.3",
+      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
+      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
+      "dependencies": {
+        "@socket.io/component-emitter": "~3.1.0",
+        "debug": "~4.3.1",
+        "engine.io-parser": "~5.2.1",
+        "ws": "~8.17.1",
+        "xmlhttprequest-ssl": "~2.1.1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/sucrase": {
-      "version": "3.34.0",
-      "resolved": "https://registry.npmjs.org/sucrase/-/sucrase-3.34.0.tgz",
-      "integrity": "sha512-70/LQEZ07TEcxiU2dz51FKaE6hCTWC6vr7FOk3Gr0U60C3shtAN+H+BFr9XlYe5xqf3RA8nrc+VIwzCfnxuXJw==",
+    "node_modules/engine.io-client/node_modules/debug": {
+      "version": "4.3.7",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
+      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
       "dependencies": {
-        "@jridgewell/gen-mapping": "^0.3.2",
-        "commander": "^4.0.0",
-        "glob": "7.1.6",
-        "lines-and-columns": "^1.1.6",
-        "mz": "^2.7.0",
-        "pirates": "^4.0.1",
-        "ts-interface-checker": "^0.1.9"
-      },
-      "bin": {
-        "sucrase": "bin/sucrase",
-        "sucrase-node": "bin/sucrase-node"
+        "ms": "^2.1.3"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6.0"
+      },
+      "peerDependenciesMeta": {
+        "supports-color": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/sucrase/node_modules/commander": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-4.1.1.tgz",
-      "integrity": "sha512-NOKm8xhkzAjzFx8B2v5OAHT+u5pRQc2UCa2Vq9jYL/31o2wi9mxBA7LIFs3sV5VSC49z6pEhfbMULvShKj26WA==",
+    "node_modules/engine.io-client/node_modules/ws": {
+      "version": "8.17.1",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
+      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
       "engines": {
-        "node": ">= 6"
+        "node": ">=10.0.0"
+      },
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": ">=5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/sudo-prompt": {
-      "version": "9.1.1",
-      "resolved": "https://registry.npmjs.org/sudo-prompt/-/sudo-prompt-9.1.1.tgz",
-      "integrity": "sha512-es33J1g2HjMpyAhz8lOR+ICmXXAqTuKbuXuUWLhOLew20oN9oUCgCJx615U/v7aioZg7IX5lIh9x34vwneu4pA==",
-      "deprecated": "Package no longer supported. Contact Support at https://www.npmjs.com/support for more info.",
-      "peer": true
+    "node_modules/engine.io-parser": {
+      "version": "5.2.3",
+      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
+      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+      "engines": {
+        "node": ">=10.0.0"
+      }
     },
-    "node_modules/cloudinary-react-native/node_modules/temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
-      "peer": true,
+    "node_modules/enhanced-resolve": {
+      "version": "5.18.1",
+      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
+      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+      "dependencies": {
+        "graceful-fs": "^4.2.4",
+        "tapable": "^2.2.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/type-fest": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
-      "peer": true,
+    "node_modules/entities": {
+      "version": "4.5.0",
+      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
+      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.12"
+      },
+      "funding": {
+        "url": "https://github.com/fb55/entities?sponsor=1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/unique-filename": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/unique-filename/-/unique-filename-1.1.1.tgz",
-      "integrity": "sha512-Vmp0jIp2ln35UTXuryvjzkjGdRyf9b2lTXuSYUiPmzRcl3FDtYqAwOnTJkAngD9SWhnoJzDbTKwaOrZ+STtxNQ==",
-      "peer": true,
+    "node_modules/env-editor": {
+      "version": "0.4.2",
+      "resolved": "https://registry.npmjs.org/env-editor/-/env-editor-0.4.2.tgz",
+      "integrity": "sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA==",
+      "engines": {
+        "node": ">=8"
+      }
+    },
+    "node_modules/eol": {
+      "version": "0.9.1",
+      "resolved": "https://registry.npmjs.org/eol/-/eol-0.9.1.tgz",
+      "integrity": "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="
+    },
+    "node_modules/error-ex": {
+      "version": "1.3.2",
+      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
+      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
       "dependencies": {
-        "unique-slug": "^2.0.0"
+        "is-arrayish": "^0.2.1"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/unique-slug": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/unique-slug/-/unique-slug-2.0.2.tgz",
-      "integrity": "sha512-zoWr9ObaxALD3DOPfjPSqxt4fnZiWblxHIgeWqW8x7UqDzEtHEQLzji2cuJYQFCU6KmoJikOYAZlrTHHebjx2w==",
-      "peer": true,
+    "node_modules/error-stack-parser": {
+      "version": "2.1.4",
+      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
+      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
       "dependencies": {
-        "imurmurhash": "^0.1.4"
+        "stackframe": "^1.3.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/unique-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-      "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
-      "peer": true,
+    "node_modules/es-abstract": {
+      "version": "1.23.9",
+      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
+      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+      "dev": true,
       "dependencies": {
-        "crypto-random-string": "^1.0.0"
+        "array-buffer-byte-length": "^1.0.2",
+        "arraybuffer.prototype.slice": "^1.0.4",
+        "available-typed-arrays": "^1.0.7",
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "data-view-buffer": "^1.0.2",
+        "data-view-byte-length": "^1.0.2",
+        "data-view-byte-offset": "^1.0.1",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.0.0",
+        "es-set-tostringtag": "^2.1.0",
+        "es-to-primitive": "^1.3.0",
+        "function.prototype.name": "^1.1.8",
+        "get-intrinsic": "^1.2.7",
+        "get-proto": "^1.0.0",
+        "get-symbol-description": "^1.1.0",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "internal-slot": "^1.1.0",
+        "is-array-buffer": "^3.0.5",
+        "is-callable": "^1.2.7",
+        "is-data-view": "^1.0.2",
+        "is-regex": "^1.2.1",
+        "is-shared-array-buffer": "^1.0.4",
+        "is-string": "^1.1.1",
+        "is-typed-array": "^1.1.15",
+        "is-weakref": "^1.1.0",
+        "math-intrinsics": "^1.1.0",
+        "object-inspect": "^1.13.3",
+        "object-keys": "^1.1.1",
+        "object.assign": "^4.1.7",
+        "own-keys": "^1.0.1",
+        "regexp.prototype.flags": "^1.5.3",
+        "safe-array-concat": "^1.1.3",
+        "safe-push-apply": "^1.0.0",
+        "safe-regex-test": "^1.1.0",
+        "set-proto": "^1.0.0",
+        "string.prototype.trim": "^1.2.10",
+        "string.prototype.trimend": "^1.0.9",
+        "string.prototype.trimstart": "^1.0.8",
+        "typed-array-buffer": "^1.0.3",
+        "typed-array-byte-length": "^1.0.3",
+        "typed-array-byte-offset": "^1.0.4",
+        "typed-array-length": "^1.0.7",
+        "unbox-primitive": "^1.1.0",
+        "which-typed-array": "^1.1.18"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
-      "peer": true,
+    "node_modules/es-define-property": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
+      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
       "engines": {
-        "node": ">= 10.0.0"
-      }
-    },
-    "node_modules/cloudinary-react-native/node_modules/uuid": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/uuid/-/uuid-3.4.0.tgz",
-      "integrity": "sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==",
-      "deprecated": "Please upgrade  to version 7 or higher.  Older versions may use Math.random() in certain circumstances, which is known to be problematic.  See https://v8.dev/blog/math-random for details.",
-      "peer": true,
-      "bin": {
-        "uuid": "bin/uuid"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/validate-npm-package-name": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-3.0.0.tgz",
-      "integrity": "sha512-M6w37eVCMMouJ9V/sdPGnC5H4uDr73/+xdq0FBLO3TFFX1+7wiUY6Es328NN+y43tmY+doUdN9g9J21vqB7iLw==",
-      "peer": true,
-      "dependencies": {
-        "builtins": "^1.0.3"
+    "node_modules/es-errors": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
+      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
-      "peer": true,
+    "node_modules/es-iterator-helpers": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
+      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
+      "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.6",
+        "es-errors": "^1.3.0",
+        "es-set-tostringtag": "^2.0.3",
+        "function-bind": "^1.1.2",
+        "get-intrinsic": "^1.2.6",
+        "globalthis": "^1.0.4",
+        "gopd": "^1.2.0",
+        "has-property-descriptors": "^1.0.2",
+        "has-proto": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "internal-slot": "^1.1.0",
+        "iterator.prototype": "^1.1.4",
+        "safe-array-concat": "^1.1.3"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/wonka": {
-      "version": "4.0.15",
-      "resolved": "https://registry.npmjs.org/wonka/-/wonka-4.0.15.tgz",
-      "integrity": "sha512-U0IUQHKXXn6PFo9nqsHphVCE5m3IntqZNB9Jjn7EB1lrR7YTDY3YWgFvEvwniTzXSvOH/XMzAZaIfJF/LvHYXg==",
+    "node_modules/es-module-lexer": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
+      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ==",
       "peer": true
     },
-    "node_modules/cloudinary-react-native/node_modules/xml2js": {
-      "version": "0.4.23",
-      "resolved": "https://registry.npmjs.org/xml2js/-/xml2js-0.4.23.tgz",
-      "integrity": "sha512-ySPiMjM0+pLDftHgXY4By0uswI3SPKLDw/i3UXbnO8M/p28zqexCUoPmQFrYD+/1BzhGJSs2i1ERWKJAtiLrug==",
-      "peer": true,
+    "node_modules/es-object-atoms": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
+      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
       "dependencies": {
-        "sax": ">=0.6.0",
-        "xmlbuilder": "~11.0.0"
+        "es-errors": "^1.3.0"
       },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/xml2js/node_modules/xmlbuilder": {
-      "version": "11.0.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-11.0.1.tgz",
-      "integrity": "sha512-fDlsI/kFEx7gLvbecc0/ohLG50fugQp8ryHzMTuW9vSa1GJ0XYWKnhsUx7oie3G98+r56aTQIUB4kht42R3JvA==",
-      "peer": true,
+    "node_modules/es-set-tostringtag": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
+      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+      "dependencies": {
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/cloudinary-react-native/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/co": {
-      "version": "4.6.0",
-      "resolved": "https://registry.npmjs.org/co/-/co-4.6.0.tgz",
-      "integrity": "sha512-QVb0dM5HvG+uaxitm8wONl7jltx8dqhfU33DcqtOZcLSVIKSDDLDi7+0LbAKiyI8hD9u42m2YxXSkMGWThaecQ==",
+    "node_modules/es-shim-unscopables": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
+      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "dev": true,
+      "dependencies": {
+        "hasown": "^2.0.2"
+      },
       "engines": {
-        "iojs": ">= 1.0.0",
-        "node": ">= 0.12.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/collect-v8-coverage": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/collect-v8-coverage/-/collect-v8-coverage-1.0.2.tgz",
-      "integrity": "sha512-lHl4d5/ONEbLlJvaJNtsF/Lz+WvB07u2ycqTYbdrq7UypDXailES4valYb2eWiJFxZlVmpGekfqoxQhzyFdT4Q=="
-    },
-    "node_modules/color": {
-      "version": "4.2.3",
-      "resolved": "https://registry.npmjs.org/color/-/color-4.2.3.tgz",
-      "integrity": "sha512-1rXeuUUiGGrykh+CeBdu5Ie7OJwinCgQY0bc7GCRxy5xVHy+moaqkpL/jqQq0MtQOeYcrqEz4abc5f0KtU7W4A==",
-      "license": "MIT",
+    "node_modules/es-to-primitive": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
+      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
+      "dev": true,
       "dependencies": {
-        "color-convert": "^2.0.1",
-        "color-string": "^1.9.0"
+        "is-callable": "^1.2.7",
+        "is-date-object": "^1.0.5",
+        "is-symbol": "^1.0.4"
       },
       "engines": {
-        "node": ">=12.5.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/color-convert": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
-      "integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
-      "dependencies": {
-        "color-name": "~1.1.4"
-      },
+    "node_modules/escalade": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
+      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
       "engines": {
-        "node": ">=7.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/color-name": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
-      "integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
+    "node_modules/escape-html": {
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
+      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
     },
-    "node_modules/color-string": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/color-string/-/color-string-1.9.1.tgz",
-      "integrity": "sha512-shrVawQFojnZv6xM40anx4CkoDP+fZsw/ZerEMsW/pyzsRbElpsL/DBVW7q3ExxwusdNXI3lXpuhEZkzs8p5Eg==",
-      "license": "MIT",
-      "dependencies": {
-        "color-name": "^1.0.0",
-        "simple-swizzle": "^0.2.2"
+    "node_modules/escape-string-regexp": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
+      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+      "engines": {
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/colord": {
-      "version": "2.9.3",
-      "resolved": "https://registry.npmjs.org/colord/-/colord-2.9.3.tgz",
-      "integrity": "sha512-jeC1axXpnb0/2nn/Y1LPuLdgXBLH7aDcHu4KEKfqw3CUhX7ZpfBSlPKyqXE6btIgEzfWtrX3/tyBCaCvXvMkOw=="
-    },
-    "node_modules/colorette": {
-      "version": "2.0.20",
-      "resolved": "https://registry.npmjs.org/colorette/-/colorette-2.0.20.tgz",
-      "integrity": "sha512-IfEDxwoWIjkeXL1eXcDiow4UbKjhLdq6/EuSVR9GMN7KVH3r9gQ83e73hsz1Nd1T3ijd5xv1wcWRYO+D6kCI2w=="
-    },
-    "node_modules/combined-stream": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/combined-stream/-/combined-stream-1.0.8.tgz",
-      "integrity": "sha512-FQN4MRfuJeHf7cBbBMJFXhKSDq+2kAArBlmRBvcvFE5BB1HZKXtSFASDhdlz9zOYwxh8lDdnvmMOe/+5cdoEdg==",
+    "node_modules/escodegen": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
+      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
       "dependencies": {
-        "delayed-stream": "~1.0.0"
+        "esprima": "^4.0.1",
+        "estraverse": "^5.2.0",
+        "esutils": "^2.0.2"
+      },
+      "bin": {
+        "escodegen": "bin/escodegen.js",
+        "esgenerate": "bin/esgenerate.js"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=6.0"
+      },
+      "optionalDependencies": {
+        "source-map": "~0.6.1"
       }
     },
-    "node_modules/command-exists": {
-      "version": "1.2.9",
-      "resolved": "https://registry.npmjs.org/command-exists/-/command-exists-1.2.9.tgz",
-      "integrity": "sha512-LTQ/SGc+s0Xc0Fu5WaKnR0YiygZkm9eKFvyS+fRsU7/ZWFF8ykFM6Pc9aCVf1+xasOOZpO3BAVgVrKvsqKHV7w=="
-    },
-    "node_modules/commander": {
-      "version": "7.2.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-7.2.0.tgz",
-      "integrity": "sha512-QrWXB+ZQSVPmIWIhtEO9H+gwHaMGYiF5ChvoJ+K9ZGHG/sVsa6yiesAD1GC/x46sET00Xlwo1u49RVVVzvcSkw==",
+    "node_modules/escodegen/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "optional": true,
       "engines": {
-        "node": ">= 10"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/commondir": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/commondir/-/commondir-1.0.1.tgz",
-      "integrity": "sha512-W9pAhw0ja1Edb5GVdIF1mjZw/ASI0AlShXM83UUGe2DVr5TdAPEA1OA8m/g8zWp9x6On7gqufY+FatDbC3MDQg=="
-    },
-    "node_modules/compare-versions": {
-      "version": "3.6.0",
-      "resolved": "https://registry.npmjs.org/compare-versions/-/compare-versions-3.6.0.tgz",
-      "integrity": "sha512-W6Af2Iw1z4CB7q4uU4hv646dW9GQuBM+YpC0UvUCWSD8w90SJjp+ujJuXaEMtAXBtSqGfMPuFOVn4/+FlaqfBA==",
-      "peer": true
-    },
-    "node_modules/component-type": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/component-type/-/component-type-1.2.2.tgz",
-      "integrity": "sha512-99VUHREHiN5cLeHm3YLq312p6v+HUEcwtLCAtelvUDI6+SH5g5Cr85oNR2S1o6ywzL0ykMbuwLzM2ANocjEOIA==",
+    "node_modules/eslint": {
+      "version": "9.21.0",
+      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
+      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
+      "dev": true,
+      "dependencies": {
+        "@eslint-community/eslint-utils": "^4.2.0",
+        "@eslint-community/regexpp": "^4.12.1",
+        "@eslint/config-array": "^0.19.2",
+        "@eslint/core": "^0.12.0",
+        "@eslint/eslintrc": "^3.3.0",
+        "@eslint/js": "9.21.0",
+        "@eslint/plugin-kit": "^0.2.7",
+        "@humanfs/node": "^0.16.6",
+        "@humanwhocodes/module-importer": "^1.0.1",
+        "@humanwhocodes/retry": "^0.4.2",
+        "@types/estree": "^1.0.6",
+        "@types/json-schema": "^7.0.15",
+        "ajv": "^6.12.4",
+        "chalk": "^4.0.0",
+        "cross-spawn": "^7.0.6",
+        "debug": "^4.3.2",
+        "escape-string-regexp": "^4.0.0",
+        "eslint-scope": "^8.2.0",
+        "eslint-visitor-keys": "^4.2.0",
+        "espree": "^10.3.0",
+        "esquery": "^1.5.0",
+        "esutils": "^2.0.2",
+        "fast-deep-equal": "^3.1.3",
+        "file-entry-cache": "^8.0.0",
+        "find-up": "^5.0.0",
+        "glob-parent": "^6.0.2",
+        "ignore": "^5.2.0",
+        "imurmurhash": "^0.1.4",
+        "is-glob": "^4.0.0",
+        "json-stable-stringify-without-jsonify": "^1.0.1",
+        "lodash.merge": "^4.6.2",
+        "minimatch": "^3.1.2",
+        "natural-compare": "^1.4.0",
+        "optionator": "^0.9.3"
+      },
+      "bin": {
+        "eslint": "bin/eslint.js"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://eslint.org/donate"
+      },
+      "peerDependencies": {
+        "jiti": "*"
+      },
+      "peerDependenciesMeta": {
+        "jiti": {
+          "optional": true
+        }
       }
     },
-    "node_modules/compressible": {
-      "version": "2.0.18",
-      "resolved": "https://registry.npmjs.org/compressible/-/compressible-2.0.18.tgz",
-      "integrity": "sha512-AF3r7P5dWxL8MxyITRMlORQNaOA2IkAFaTr4k7BUumjPtRpGDTZpl0Pb1XCO6JeDCBdp126Cgs9sMxqSjgYyRg==",
+    "node_modules/eslint-config-prettier": {
+      "version": "10.0.1",
+      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz",
+      "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==",
+      "dev": true,
+      "bin": {
+        "eslint-config-prettier": "build/bin/cli.js"
+      },
+      "peerDependencies": {
+        "eslint": ">=7.0.0"
+      }
+    },
+    "node_modules/eslint-import-resolver-typescript": {
+      "version": "3.8.3",
+      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.8.3.tgz",
+      "integrity": "sha512-A0bu4Ks2QqDWNpeEgTQMPTngaMhuDu4yv6xpftBMAf+1ziXnpx+eSR1WRfoPTe2BAiAjHFZ7kSNx1fvr5g5pmQ==",
+      "dev": true,
       "dependencies": {
-        "mime-db": ">= 1.43.0 < 2"
+        "@nolyfill/is-core-module": "1.0.39",
+        "debug": "^4.3.7",
+        "enhanced-resolve": "^5.15.0",
+        "get-tsconfig": "^4.10.0",
+        "is-bun-module": "^1.0.2",
+        "stable-hash": "^0.0.4",
+        "tinyglobby": "^0.2.12"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.18.0 || >=16.0.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
+      },
+      "peerDependencies": {
+        "eslint": "*",
+        "eslint-plugin-import": "*",
+        "eslint-plugin-import-x": "*"
+      },
+      "peerDependenciesMeta": {
+        "eslint-plugin-import": {
+          "optional": true
+        },
+        "eslint-plugin-import-x": {
+          "optional": true
+        }
       }
     },
-    "node_modules/compression": {
-      "version": "1.8.0",
-      "resolved": "https://registry.npmjs.org/compression/-/compression-1.8.0.tgz",
-      "integrity": "sha512-k6WLKfunuqCYD3t6AsuPGvQWaKwuLLh2/xHNcX4qE+vIfDNXpSqnrhwA7O53R7WVQUnt8dVAIW+YHr7xTgOgGA==",
+    "node_modules/eslint-plugin-react": {
+      "version": "7.37.4",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
+      "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
+      "dev": true,
       "dependencies": {
-        "bytes": "3.1.2",
-        "compressible": "~2.0.18",
-        "debug": "2.6.9",
-        "negotiator": "~0.6.4",
-        "on-headers": "~1.0.2",
-        "safe-buffer": "5.2.1",
-        "vary": "~1.1.2"
+        "array-includes": "^3.1.8",
+        "array.prototype.findlast": "^1.2.5",
+        "array.prototype.flatmap": "^1.3.3",
+        "array.prototype.tosorted": "^1.1.4",
+        "doctrine": "^2.1.0",
+        "es-iterator-helpers": "^1.2.1",
+        "estraverse": "^5.3.0",
+        "hasown": "^2.0.2",
+        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
+        "minimatch": "^3.1.2",
+        "object.entries": "^1.1.8",
+        "object.fromentries": "^2.0.8",
+        "object.values": "^1.2.1",
+        "prop-types": "^15.8.1",
+        "resolve": "^2.0.0-next.5",
+        "semver": "^6.3.1",
+        "string.prototype.matchall": "^4.0.12",
+        "string.prototype.repeat": "^1.0.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=4"
+      },
+      "peerDependencies": {
+        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
       }
     },
-    "node_modules/compression/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/eslint-plugin-react-native": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-5.0.0.tgz",
+      "integrity": "sha512-VyWlyCC/7FC/aONibOwLkzmyKg4j9oI8fzrk9WYNs4I8/m436JuOTAFwLvEn1CVvc7La4cPfbCyspP4OYpP52Q==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/compression/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/compression/node_modules/negotiator": {
-      "version": "0.6.4",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.4.tgz",
-      "integrity": "sha512-myRT3DiWPHqho5PrJaIRyaMv2kgYf0mUVgBNOYMuCH5Ki1yEiQaf/ZJuQ62nvpc44wL5WDbTX7yGJi1Neevw8w==",
-      "engines": {
-        "node": ">= 0.6"
+        "eslint-plugin-react-native-globals": "^0.1.1"
+      },
+      "peerDependencies": {
+        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
       }
     },
-    "node_modules/concat-map": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
-      "integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
+    "node_modules/eslint-plugin-react-native-globals": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz",
+      "integrity": "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==",
+      "dev": true
     },
-    "node_modules/concat-stream": {
-      "version": "1.6.2",
-      "resolved": "https://registry.npmjs.org/concat-stream/-/concat-stream-1.6.2.tgz",
-      "integrity": "sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==",
-      "engines": [
-        "node >= 0.8"
-      ],
+    "node_modules/eslint-plugin-react/node_modules/resolve": {
+      "version": "2.0.0-next.5",
+      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
+      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
+      "dev": true,
       "dependencies": {
-        "buffer-from": "^1.0.0",
-        "inherits": "^2.0.3",
-        "readable-stream": "^2.2.2",
-        "typedarray": "^0.0.6"
+        "is-core-module": "^2.13.0",
+        "path-parse": "^1.0.7",
+        "supports-preserve-symlinks-flag": "^1.0.0"
+      },
+      "bin": {
+        "resolve": "bin/resolve"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/concat-stream/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "node_modules/concat-stream/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
+    "node_modules/eslint-scope": {
+      "version": "8.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
+      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
+      "dev": true,
       "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
+        "esrecurse": "^4.3.0",
+        "estraverse": "^5.2.0"
+      },
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/concat-stream/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
+    "node_modules/eslint-visitor-keys": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
+      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
+      "dev": true,
+      "engines": {
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
+      }
     },
-    "node_modules/concat-stream/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
+    "node_modules/eslint/node_modules/glob-parent": {
+      "version": "6.0.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
+      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+      "dev": true,
       "dependencies": {
-        "safe-buffer": "~5.1.0"
+        "is-glob": "^4.0.3"
+      },
+      "engines": {
+        "node": ">=10.13.0"
       }
     },
-    "node_modules/connect": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/connect/-/connect-3.7.0.tgz",
-      "integrity": "sha512-ZqRXc+tZukToSNmh5C2iWMSoV3X1YUcPbqEM4DkEG5tNQXrQUZCNVGGv3IuicnkMtPfGf3Xtp8WCXs295iQ1pQ==",
+    "node_modules/espree": {
+      "version": "10.3.0",
+      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
+      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
+      "dev": true,
       "dependencies": {
-        "debug": "2.6.9",
-        "finalhandler": "1.1.2",
-        "parseurl": "~1.3.3",
-        "utils-merge": "1.0.1"
+        "acorn": "^8.14.0",
+        "acorn-jsx": "^5.3.2",
+        "eslint-visitor-keys": "^4.2.0"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
+      },
+      "funding": {
+        "url": "https://opencollective.com/eslint"
       }
     },
-    "node_modules/connect-history-api-fallback": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/connect-history-api-fallback/-/connect-history-api-fallback-2.0.0.tgz",
-      "integrity": "sha512-U73+6lQFmfiNPrYbXqr6kZ1i1wiRqXnp2nhMsINseWXO8lDau0LGEffJ8kQi4EjLZympVgRdvqjAgiZ1tgzDDA==",
+    "node_modules/esprima": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
+      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
+      "bin": {
+        "esparse": "bin/esparse.js",
+        "esvalidate": "bin/esvalidate.js"
+      },
       "engines": {
-        "node": ">=0.8"
+        "node": ">=4"
       }
     },
-    "node_modules/connect/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/esquery": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
+      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
+      "dev": true,
       "dependencies": {
-        "ms": "2.0.0"
+        "estraverse": "^5.1.0"
+      },
+      "engines": {
+        "node": ">=0.10"
       }
     },
-    "node_modules/connect/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/console-browserify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/console-browserify/-/console-browserify-1.2.0.tgz",
-      "integrity": "sha512-ZMkYO/LkF17QvCPqM0gxw8yUzigAOZOSWSHg91FH6orS7vcEj5dVZTidN2fQ14yBSdg97RqhSNwLUXInd52OTA=="
-    },
-    "node_modules/constants-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/constants-browserify/-/constants-browserify-1.0.0.tgz",
-      "integrity": "sha512-xFxOwqIzR/e1k1gLiWEophSCMqXcwVHIH7akf7b/vxcUeGunlj3hvZaaqxwHsTgn+IndtkQJgSztIDWeumWJDQ=="
-    },
-    "node_modules/content-disposition": {
-      "version": "0.5.4",
-      "resolved": "https://registry.npmjs.org/content-disposition/-/content-disposition-0.5.4.tgz",
-      "integrity": "sha512-FveZTNuGw04cxlAiWbzi6zTAL/lhehaWbTtgluJh4/E95DqMwTmha3KZN1aAWA8cFIhHzMZUvLevkw5Rqk+tSQ==",
+    "node_modules/esrecurse": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
+      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
       "dependencies": {
-        "safe-buffer": "5.2.1"
+        "estraverse": "^5.2.0"
       },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4.0"
       }
     },
-    "node_modules/content-type": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/content-type/-/content-type-1.0.5.tgz",
-      "integrity": "sha512-nTjqfcBFEipKdXCv4YDQWCfmcLZKm81ldF0pAopTvyrFGVbcR6P/VAAd5G7N+0tTr8QqiU0tFadD6FK4NtJwOA==",
+    "node_modules/estraverse": {
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
+      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=4.0"
       }
     },
-    "node_modules/convert-source-map": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/convert-source-map/-/convert-source-map-2.0.0.tgz",
-      "integrity": "sha512-Kvp459HrV2FEJ1CAsi1Ku+MY3kasH19TFykTz2xWmMeq6bk2NU3XXvfJ+Q61m0xktWwt+1HSYf3JZsTms3aRJg=="
+    "node_modules/esutils": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
+      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/cookie": {
-      "version": "0.7.1",
-      "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.7.1.tgz",
-      "integrity": "sha512-6DnInpx7SJ2AK3+CTUE/ZM0vWTUboZCegxhC2xiIydHR9jNuTAASBrfEpHhiGOZw/nX51bHt6YQl8jsGo4y/0w==",
+    "node_modules/etag": {
+      "version": "1.8.1",
+      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
+      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
       "engines": {
         "node": ">= 0.6"
       }
     },
-    "node_modules/cookie-signature": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/cookie-signature/-/cookie-signature-1.0.6.tgz",
-      "integrity": "sha512-QADzlaHc8icV8I7vbaJXJwod9HWYp8uCqf1xa4OfNu1T7JVxQIrUgOWtHdNDtPiywmFbiS12VjotIXLrKM3orQ=="
-    },
-    "node_modules/copy-webpack-plugin": {
-      "version": "10.2.4",
-      "resolved": "https://registry.npmjs.org/copy-webpack-plugin/-/copy-webpack-plugin-10.2.4.tgz",
-      "integrity": "sha512-xFVltahqlsRcyyJqQbDY6EYTtyQZF9rf+JPjwHObLdPFMEISqkFkr7mFoVOC6BfYS/dNThyoQKvziugm+OnwBg==",
-      "dependencies": {
-        "fast-glob": "^3.2.7",
-        "glob-parent": "^6.0.1",
-        "globby": "^12.0.2",
-        "normalize-path": "^3.0.0",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0"
-      },
+    "node_modules/event-target-shim": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
+      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
       "engines": {
-        "node": ">= 12.20.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.1.0"
+        "node": ">=6"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/array-union": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/array-union/-/array-union-3.0.1.tgz",
-      "integrity": "sha512-1OvF9IbWwaeiM9VhzYXVQacMibxpXOMYVNIvMtKRyX9SImBXpKcFr8XvFDeEslCyuH/t6KRt7HEO94AlP8Iatw==",
+    "node_modules/events": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
+      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+      "peer": true,
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=0.8.x"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/exec-async": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
+      "integrity": "sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw=="
+    },
+    "node_modules/execa": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
+      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
       "dependencies": {
-        "is-glob": "^4.0.3"
+        "cross-spawn": "^6.0.0",
+        "get-stream": "^4.0.0",
+        "is-stream": "^1.1.0",
+        "npm-run-path": "^2.0.0",
+        "p-finally": "^1.0.0",
+        "signal-exit": "^3.0.0",
+        "strip-eof": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=6"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/globby": {
-      "version": "12.2.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-12.2.0.tgz",
-      "integrity": "sha512-wiSuFQLZ+urS9x2gGPl1H5drc5twabmm4m2gTR27XDFyjUHJUNsS8o/2aKyIF6IoBaR630atdher0XJ5g6OMmA==",
+    "node_modules/execa/node_modules/cross-spawn": {
+      "version": "6.0.6",
+      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
+      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
       "dependencies": {
-        "array-union": "^3.0.1",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.7",
-        "ignore": "^5.1.9",
-        "merge2": "^1.4.1",
-        "slash": "^4.0.0"
+        "nice-try": "^1.0.4",
+        "path-key": "^2.0.1",
+        "semver": "^5.5.0",
+        "shebang-command": "^1.2.0",
+        "which": "^1.2.9"
       },
       "engines": {
-        "node": "^12.20.0 || ^14.13.1 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4.8"
       }
     },
-    "node_modules/copy-webpack-plugin/node_modules/slash": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-4.0.0.tgz",
-      "integrity": "sha512-3dOsAHXXUkQTpOYcoAxLIorMTp4gIQr5IW3iVb7A7lFIp0VHhnynm9izx6TssdrIcVIESAlVjtnO2K8bg+Coew==",
+    "node_modules/execa/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/core-js": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js/-/core-js-3.40.0.tgz",
-      "integrity": "sha512-7vsMc/Lty6AGnn7uFpYT56QesI5D2Y/UkgKounk87OP9Z2H9Z8kj6jzcSGAxFmUtDOS0ntK6lbQz+Nsa0Jj6mQ==",
-      "hasInstallScript": true,
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
-      }
-    },
-    "node_modules/core-js-compat": {
-      "version": "3.40.0",
-      "resolved": "https://registry.npmjs.org/core-js-compat/-/core-js-compat-3.40.0.tgz",
-      "integrity": "sha512-0XEDpr5y5mijvw8Lbc6E5AkjrHfp7eEoPlu36SWeAbcL8fn1G1ANe8DBlo2XoNN89oVpxWwOjYIPVzR4ZvsKCQ==",
-      "dependencies": {
-        "browserslist": "^4.24.3"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/core-js"
+    "node_modules/execa/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
+      "bin": {
+        "semver": "bin/semver"
       }
     },
-    "node_modules/core-util-is": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.3.tgz",
-      "integrity": "sha512-ZQBvi1DcpJ4GDqanjucZ2Hj3wEO5pZDS89BWbkcrvdxksJorwUDDZamX9ldFkp9aw2lmBDLgkObEA4DWNJ9FYQ=="
-    },
-    "node_modules/cosmiconfig": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/cosmiconfig/-/cosmiconfig-5.2.1.tgz",
-      "integrity": "sha512-H65gsXo1SKjf8zmrJ67eJk8aIRKV5ff2D4uKZIBZShbhGSpEmsQOPW/SKMKYhSTrqR7ufy6RP69rPogdaPh/kA==",
+    "node_modules/execa/node_modules/shebang-command": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
+      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
       "dependencies": {
-        "import-fresh": "^2.0.0",
-        "is-directory": "^0.3.1",
-        "js-yaml": "^3.13.1",
-        "parse-json": "^4.0.0"
+        "shebang-regex": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/create-jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/create-jest/-/create-jest-29.7.0.tgz",
-      "integrity": "sha512-Adz2bdH0Vq3F53KEMJOoftQFutWCukm6J24wbPWRO4k1kMY7gS7ds/uoJkNuV8wDCtWWnuwGcJwpWcih+zEW1Q==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "exit": "^0.1.2",
-        "graceful-fs": "^4.2.9",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "prompts": "^2.0.1"
-      },
-      "bin": {
-        "create-jest": "bin/create-jest.js"
-      },
+    "node_modules/execa/node_modules/shebang-regex": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
+      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/cross-fetch": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/cross-fetch/-/cross-fetch-3.2.0.tgz",
-      "integrity": "sha512-Q+xVJLoGOeIMXZmbUK4HYk+69cQH6LudR0Vu/pRm2YlU/hDV9CiS0gKUMaWY5f2NeUH9C1nV3bsTlCo0FsTV1Q==",
-      "dependencies": {
-        "node-fetch": "^2.7.0"
-      }
+    "node_modules/execa/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/cross-spawn": {
-      "version": "7.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-7.0.6.tgz",
-      "integrity": "sha512-uV2QOWP2nWzsy2aMp8aRibhi9dlzF5Hgh5SHaB9OiTGEyDTiJJyx0uy51QXdyWbtAHNua4XJzUKca3OzKUd3vA==",
+    "node_modules/execa/node_modules/which": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
+      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
       "dependencies": {
-        "path-key": "^3.1.0",
-        "shebang-command": "^2.0.0",
-        "which": "^2.0.1"
+        "isexe": "^2.0.0"
       },
-      "engines": {
-        "node": ">= 8"
-      }
-    },
-    "node_modules/crypt": {
-      "version": "0.0.2",
-      "resolved": "https://registry.npmjs.org/crypt/-/crypt-0.0.2.tgz",
-      "integrity": "sha512-mCxBlsHFYh9C+HVpiEacem8FEBnMXgU9gy4zmNC+SXAZNB/1idgp/aulFJ4FgCi7GPEVbfyng092GqL2k2rmow==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/crypto-random-string": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-2.0.0.tgz",
-      "integrity": "sha512-v1plID3y9r/lPhviJ1wrXpLeyUIGAZ2SHNYTEapm7/8A9nLPoyvVp3RK/EPFqn5kEznyWgYZNsRtYYIWbuG8KA==",
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "which": "bin/which"
       }
     },
-    "node_modules/css-declaration-sorter": {
-      "version": "6.4.1",
-      "resolved": "https://registry.npmjs.org/css-declaration-sorter/-/css-declaration-sorter-6.4.1.tgz",
-      "integrity": "sha512-rtdthzxKuyq6IzqX6jEcIzQF/YqccluefyCYheovBOLhFT/drQA9zj/UbRAa9J7C0o6EG6u3E6g+vKkay7/k3g==",
+    "node_modules/exit": {
+      "version": "0.1.2",
+      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
+      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
       "engines": {
-        "node": "^10 || ^12 || >=14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.9"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/css-in-js-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/css-in-js-utils/-/css-in-js-utils-3.1.0.tgz",
-      "integrity": "sha512-fJAcud6B3rRu+KHYk+Bwf+WFL2MDCJJ1XG9x137tJQ0xYxor7XziQtuGFbWNdqrvF4Tk26O3H73nfVqXt/fW1A==",
+    "node_modules/expect": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
+      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
       "dependencies": {
-        "hyphenate-style-name": "^1.0.3"
+        "@jest/expect-utils": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/css-loader": {
-      "version": "6.11.0",
-      "resolved": "https://registry.npmjs.org/css-loader/-/css-loader-6.11.0.tgz",
-      "integrity": "sha512-CTJ+AEQJjq5NzLga5pE39qdiSV56F8ywCIsqNIRF0r7BDgWsN25aazToqAFg7ZrtA/U016xudB3ffgweORxX7g==",
+    "node_modules/expo": {
+      "version": "52.0.37",
+      "resolved": "https://registry.npmjs.org/expo/-/expo-52.0.37.tgz",
+      "integrity": "sha512-fo37ClqjNLOVInerm7BU27H8lfPfeTC7Pmu72roPzq46DnJfs+KzTxTzE34GcJ0b6hMUx9FRSSGyTQqxzo2TVQ==",
       "dependencies": {
-        "icss-utils": "^5.1.0",
-        "postcss": "^8.4.33",
-        "postcss-modules-extract-imports": "^3.1.0",
-        "postcss-modules-local-by-default": "^4.0.5",
-        "postcss-modules-scope": "^3.2.0",
-        "postcss-modules-values": "^4.0.0",
-        "postcss-value-parser": "^4.2.0",
-        "semver": "^7.5.4"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
+        "@babel/runtime": "^7.20.0",
+        "@expo/cli": "0.22.18",
+        "@expo/config": "~10.0.10",
+        "@expo/config-plugins": "~9.0.15",
+        "@expo/fingerprint": "0.11.11",
+        "@expo/metro-config": "0.19.11",
+        "@expo/vector-icons": "^14.0.0",
+        "babel-preset-expo": "~12.0.9",
+        "expo-asset": "~11.0.4",
+        "expo-constants": "~17.0.7",
+        "expo-file-system": "~18.0.11",
+        "expo-font": "~13.0.4",
+        "expo-keep-awake": "~14.0.3",
+        "expo-modules-autolinking": "2.0.8",
+        "expo-modules-core": "2.2.2",
+        "fbemitter": "^3.0.0",
+        "web-streams-polyfill": "^3.3.2",
+        "whatwg-url-without-unicode": "8.0.0-3"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+      "bin": {
+        "expo": "bin/cli"
       },
       "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.0.0"
+        "@expo/dom-webview": "*",
+        "@expo/metro-runtime": "*",
+        "react": "*",
+        "react-native": "*",
+        "react-native-webview": "*"
       },
       "peerDependenciesMeta": {
-        "@rspack/core": {
+        "@expo/dom-webview": {
+          "optional": true
+        },
+        "@expo/metro-runtime": {
           "optional": true
         },
-        "webpack": {
+        "react-native-webview": {
           "optional": true
         }
       }
     },
-    "node_modules/css-loader/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/expo-asset": {
+      "version": "11.0.4",
+      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.4.tgz",
+      "integrity": "sha512-CdIywU0HrR3wsW5c3n0cT3jW9hccZdnqGsRqY+EY/RWzJbDXtDfAQVEiFHO3mDK7oveUwrP2jK/6ZRNek41/sg==",
+      "dependencies": {
+        "@expo/image-utils": "^0.6.5",
+        "expo-constants": "~17.0.7",
+        "invariant": "^2.2.4",
+        "md5-file": "^3.2.3"
       },
-      "engines": {
-        "node": ">=10"
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin": {
-      "version": "3.4.1",
-      "resolved": "https://registry.npmjs.org/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.4.1.tgz",
-      "integrity": "sha512-1u6D71zeIfgngN2XNRJefc/hY7Ybsxd74Jm4qngIXyUEk7fss3VUzuHxLAq/R8NAba4QU9OUSaMZlbpRc7bM4Q==",
+    "node_modules/expo-constants": {
+      "version": "17.0.7",
+      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.7.tgz",
+      "integrity": "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA==",
+      "license": "MIT",
       "dependencies": {
-        "cssnano": "^5.0.6",
-        "jest-worker": "^27.0.2",
-        "postcss": "^8.3.5",
-        "schema-utils": "^4.0.0",
-        "serialize-javascript": "^6.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
+        "@expo/config": "~10.0.10",
+        "@expo/env": "~0.4.2"
       },
       "peerDependencies": {
-        "webpack": "^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@parcel/css": {
-          "optional": true
-        },
-        "clean-css": {
-          "optional": true
-        },
-        "csso": {
-          "optional": true
-        },
-        "esbuild": {
-          "optional": true
-        }
+        "expo": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/jest-worker": {
-      "version": "27.5.1",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
-      "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+    "node_modules/expo-dev-client": {
+      "version": "5.0.20",
+      "resolved": "https://registry.npmjs.org/expo-dev-client/-/expo-dev-client-5.0.20.tgz",
+      "integrity": "sha512-bLNkHdU7V3I4UefgJbJnIDUBUL0LxIal/xYEx9BbgDd3B7wgQKY//+BpPIxBOKCQ22lkyiHY8y9tLhO903sAgg==",
+      "license": "MIT",
       "dependencies": {
-        "@types/node": "*",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
+        "expo-dev-launcher": "5.0.35",
+        "expo-dev-menu": "6.0.25",
+        "expo-dev-menu-interface": "1.9.3",
+        "expo-manifests": "~0.15.8",
+        "expo-updates-interface": "~1.0.0"
       },
-      "engines": {
-        "node": ">= 10.13.0"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/expo-dev-launcher": {
+      "version": "5.0.35",
+      "resolved": "https://registry.npmjs.org/expo-dev-launcher/-/expo-dev-launcher-5.0.35.tgz",
+      "integrity": "sha512-hEQr0ZREnUMxZ6wtQgfK1lzYnbb0zar3HqYZhmANzXmE6UEPbQ4GByLzhpfz/d+xxdBVQZsrHdtiV28KPG2sog==",
+      "license": "MIT",
+      "dependencies": {
+        "ajv": "8.11.0",
+        "expo-dev-menu": "6.0.25",
+        "expo-manifests": "~0.15.8",
+        "resolve-from": "^5.0.0"
+      },
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/css-minimizer-webpack-plugin/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+    "node_modules/expo-dev-launcher/node_modules/ajv": {
+      "version": "8.11.0",
+      "resolved": "https://registry.npmjs.org/ajv/-/ajv-8.11.0.tgz",
+      "integrity": "sha512-wGgprdCvMalC0BztXvitD2hC04YffAvtsUn93JbGXYLAtCUO4xd17mCCZQxUOItiBwZvJScWo8NIvQMQ71rdpg==",
+      "license": "MIT",
       "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
+        "fast-deep-equal": "^3.1.1",
+        "json-schema-traverse": "^1.0.0",
+        "require-from-string": "^2.0.2",
+        "uri-js": "^4.2.2"
       },
       "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
+        "type": "github",
+        "url": "https://github.com/sponsors/epoberezkin"
       }
     },
-    "node_modules/css-select": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-5.1.0.tgz",
-      "integrity": "sha512-nwoRF1rvRRnnCqqY7updORDsuqKzqYJ28+oSMaJMMgOauh3fvwHqMS7EZpIPqK8GL+g9mKxF1vP/ZjSeNjEVHg==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.1.0",
-        "domhandler": "^5.0.2",
-        "domutils": "^3.0.1",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
+    "node_modules/expo-dev-launcher/node_modules/json-schema-traverse": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
+      "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug==",
+      "license": "MIT"
     },
-    "node_modules/css-tree": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-1.1.3.tgz",
-      "integrity": "sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==",
+    "node_modules/expo-dev-menu": {
+      "version": "6.0.25",
+      "resolved": "https://registry.npmjs.org/expo-dev-menu/-/expo-dev-menu-6.0.25.tgz",
+      "integrity": "sha512-K2m4z/I+CPWbMtHlDzU68lHaQs52De0v5gbsjAmA5ig8FrYh4MKZvPxSVANaiKENzgmtglu8qaFh7ua9Gt2TfA==",
+      "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.14",
-        "source-map": "^0.6.1"
+        "expo-dev-menu-interface": "1.9.3"
       },
-      "engines": {
-        "node": ">=8.0.0"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/css-tree/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/expo-dev-menu-interface": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/expo-dev-menu-interface/-/expo-dev-menu-interface-1.9.3.tgz",
+      "integrity": "sha512-KY/dWTBE1l47i9V366JN5rC6YIdOc9hz8yAmZzkl5DrPia5l3M2WIjtnpHC9zUkNjiSiG2urYoOAq4H/uLdmyg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/css-what": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/css-what/-/css-what-6.1.0.tgz",
-      "integrity": "sha512-HTUrgRJ7r4dsZKU6GjmpfRK1O76h97Z8MfS1G0FozR+oF2kG6Vfe8JE6zwrkbxigziPHinCJ+gCPjA9EaBDtRw==",
-      "engines": {
-        "node": ">= 6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
+    "node_modules/expo-eas-client": {
+      "version": "0.13.3",
+      "resolved": "https://registry.npmjs.org/expo-eas-client/-/expo-eas-client-0.13.3.tgz",
+      "integrity": "sha512-t+1F1tiDocSot8iSnrn/CjTUMvVvPV2DpafSVcticpbSzMGybEN7wcamO1t18fK7WxGXpZE9gxtd80qwv/LLqQ==",
+      "license": "MIT"
     },
-    "node_modules/cssesc": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/cssesc/-/cssesc-3.0.0.tgz",
-      "integrity": "sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==",
-      "bin": {
-        "cssesc": "bin/cssesc"
+    "node_modules/expo-file-system": {
+      "version": "18.0.11",
+      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.11.tgz",
+      "integrity": "sha512-yDwYfEzWgPXsBZHJW2RJ8Q66ceiFN9Wa5D20pp3fjXVkzPBDwxnYwiPWk4pVmCa5g4X5KYMoMne1pUrsL4OEpg==",
+      "dependencies": {
+        "web-streams-polyfill": "^3.3.2"
       },
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/cssnano": {
-      "version": "5.1.15",
-      "resolved": "https://registry.npmjs.org/cssnano/-/cssnano-5.1.15.tgz",
-      "integrity": "sha512-j+BKgDcLDQA+eDifLx0EO4XSA56b7uut3BQFH+wbSaSTuGLuiyTa/wbRYthUXX8LC9mLg+WWKe8h+qJuwTAbHw==",
+    "node_modules/expo-font": {
+      "version": "13.0.4",
+      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-13.0.4.tgz",
+      "integrity": "sha512-eAP5hyBgC8gafFtprsz0HMaB795qZfgJWqTmU0NfbSin1wUuVySFMEPMOrTkTgmazU73v4Cb4x7p86jY1XXYUw==",
       "dependencies": {
-        "cssnano-preset-default": "^5.2.14",
-        "lilconfig": "^2.0.3",
-        "yaml": "^1.10.2"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/cssnano"
+        "fontfaceobserver": "^2.1.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/cssnano-preset-default": {
-      "version": "5.2.14",
-      "resolved": "https://registry.npmjs.org/cssnano-preset-default/-/cssnano-preset-default-5.2.14.tgz",
-      "integrity": "sha512-t0SFesj/ZV2OTylqQVOrFgEh5uanxbO6ZAdeCrNsUQ6fVuXwYTxJPNAGvGTxHbD68ldIJNec7PyYZDBrfDQ+6A==",
-      "dependencies": {
-        "css-declaration-sorter": "^6.3.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-calc": "^8.2.3",
-        "postcss-colormin": "^5.3.1",
-        "postcss-convert-values": "^5.1.3",
-        "postcss-discard-comments": "^5.1.2",
-        "postcss-discard-duplicates": "^5.1.0",
-        "postcss-discard-empty": "^5.1.1",
-        "postcss-discard-overridden": "^5.1.0",
-        "postcss-merge-longhand": "^5.1.7",
-        "postcss-merge-rules": "^5.1.4",
-        "postcss-minify-font-values": "^5.1.0",
-        "postcss-minify-gradients": "^5.1.1",
-        "postcss-minify-params": "^5.1.4",
-        "postcss-minify-selectors": "^5.2.1",
-        "postcss-normalize-charset": "^5.1.0",
-        "postcss-normalize-display-values": "^5.1.0",
-        "postcss-normalize-positions": "^5.1.1",
-        "postcss-normalize-repeat-style": "^5.1.1",
-        "postcss-normalize-string": "^5.1.0",
-        "postcss-normalize-timing-functions": "^5.1.0",
-        "postcss-normalize-unicode": "^5.1.1",
-        "postcss-normalize-url": "^5.1.0",
-        "postcss-normalize-whitespace": "^5.1.1",
-        "postcss-ordered-values": "^5.1.3",
-        "postcss-reduce-initial": "^5.1.2",
-        "postcss-reduce-transforms": "^5.1.0",
-        "postcss-svgo": "^5.1.0",
-        "postcss-unique-selectors": "^5.1.1"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
+        "expo": "*",
+        "react": "*"
+      }
+    },
+    "node_modules/expo-image-loader": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-5.0.0.tgz",
+      "integrity": "sha512-Eg+5FHtyzv3Jjw9dHwu2pWy4xjf8fu3V0Asyy42kO+t/FbvW/vjUixpTjPtgKQLQh+2/9Nk4JjFDV6FwCnF2ZA==",
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "expo": "*"
       }
     },
-    "node_modules/cssnano-utils": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/cssnano-utils/-/cssnano-utils-3.1.0.tgz",
-      "integrity": "sha512-JQNR19/YZhz4psLX/rQ9M83e3z2Wf/HdJbryzte4a3NSuafyp9w/I4U+hx5C2S9g41qlstH7DEWnZaaj83OuEA==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
+    "node_modules/expo-image-picker": {
+      "version": "16.0.6",
+      "resolved": "https://registry.npmjs.org/expo-image-picker/-/expo-image-picker-16.0.6.tgz",
+      "integrity": "sha512-HN4xZirFjsFDIsWFb12AZh19fRzuvZjj2ll17cGr19VNRP06S/VPQU3Tdccn5vwUzQhOBlLu704CnNm278boiQ==",
+      "dependencies": {
+        "expo-image-loader": "~5.0.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "expo": "*"
       }
     },
-    "node_modules/cssnano/node_modules/lilconfig": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-2.1.0.tgz",
-      "integrity": "sha512-utWOt/GHzuUxnLKxB6dk81RoOeoNeHgbrXiuGk4yyF5qlRz+iIVWu56E2fqGHFrXz0QNUhLB/8nKqvRH66JKGQ==",
-      "engines": {
-        "node": ">=10"
-      }
+    "node_modules/expo-json-utils": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
+      "integrity": "sha512-xjGfK9dL0B1wLnOqNkX0jM9p48Y0I5xEPzHude28LY67UmamUyAACkqhZGaPClyPNfdzczk7Ej6WaRMT3HfXvw==",
+      "license": "MIT"
     },
-    "node_modules/cssnano/node_modules/yaml": {
-      "version": "1.10.2",
-      "resolved": "https://registry.npmjs.org/yaml/-/yaml-1.10.2.tgz",
-      "integrity": "sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==",
-      "engines": {
-        "node": ">= 6"
+    "node_modules/expo-keep-awake": {
+      "version": "14.0.3",
+      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-14.0.3.tgz",
+      "integrity": "sha512-6Jh94G6NvTZfuLnm2vwIpKe3GdOiVBuISl7FI8GqN0/9UOg9E0WXXp5cDcfAG8bn80RfgLJS8P7EPUGTZyOvhg==",
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
       }
     },
-    "node_modules/csso": {
-      "version": "5.0.5",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-5.0.5.tgz",
-      "integrity": "sha512-0LrrStPOdJj+SPCCrGhzryycLjwcgUSHBtxNA8aIDxf0GLsRh1cKYhB00Gd1lDOS4yGH69+SNn13+TWbVHETFQ==",
-      "dev": true,
+    "node_modules/expo-linking": {
+      "version": "7.0.5",
+      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-7.0.5.tgz",
+      "integrity": "sha512-3KptlJtcYDPWohk0MfJU75MJFh2ybavbtcSd84zEPfw9s1q3hjimw3sXnH03ZxP54kiEWldvKmmnGcVffBDB1g==",
       "license": "MIT",
       "dependencies": {
-        "css-tree": "~2.2.0"
+        "expo-constants": "~17.0.5",
+        "invariant": "^2.2.4"
       },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/csso/node_modules/css-tree": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/css-tree/-/css-tree-2.2.1.tgz",
-      "integrity": "sha512-OA0mILzGc1kCOCSJerOeqDxDQ4HOh+G8NbOJFOTgOCzpw7fCBubk0fEyxp8AgOL/jvLgYA/uV0cMbe43ElF1JA==",
-      "dev": true,
+    "node_modules/expo-location": {
+      "version": "18.0.10",
+      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
+      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-manifests": {
+      "version": "0.15.8",
+      "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.15.8.tgz",
+      "integrity": "sha512-VuIyaMfRfLZeETNsRohqhy1l7iZ7I+HKMPfZXVL2Yn17TT0WkOhZoq1DzYwPbOHPgp1Uk6phNa86EyaHrD2DLw==",
       "license": "MIT",
       "dependencies": {
-        "mdn-data": "2.0.28",
-        "source-map-js": "^1.0.1"
+        "@expo/config": "~10.0.11",
+        "expo-json-utils": "~0.14.0"
       },
-      "engines": {
-        "node": "^10 || ^12.20.0 || ^14.13.0 || >=15.0.0",
-        "npm": ">=7.0.0"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/csso/node_modules/mdn-data": {
-      "version": "2.0.28",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.28.tgz",
-      "integrity": "sha512-aylIc7Z9y4yzHYAJNuESG3hfhC+0Ibp/MAMiaOZgNv4pmEdFyfZhhhny4MNiAfWdBQ1RQ2mfDWmM1x8SvGyp8g==",
-      "dev": true,
-      "license": "CC0-1.0"
-    },
-    "node_modules/cssom": {
-      "version": "0.5.0",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.5.0.tgz",
-      "integrity": "sha512-iKuQcq+NdHqlAcwUY0o/HL69XQrUaQdMjmStJ8JFmUaiiQErlhrmuigkg/CU4E2J0IyUKUrMAgl36TvN67MqTw=="
-    },
-    "node_modules/cssstyle": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/cssstyle/-/cssstyle-2.3.0.tgz",
-      "integrity": "sha512-AZL67abkUzIuvcHqk7c09cezpGNcxUxU4Ioi/05xHk4DQeTkWmGYftIE6ctU6AEt+Gn4n1lDStOtj7FKycP71A==",
+    "node_modules/expo-modules-autolinking": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.8.tgz",
+      "integrity": "sha512-DezgnEYFQYic8hKGhkbztBA3QUmSftjaNDIKNAtS2iGJmzCcNIkatjN2slFDSWjSTNo8gOvPQyMKfyHWFvLpOQ==",
       "dependencies": {
-        "cssom": "~0.3.6"
+        "@expo/spawn-async": "^1.7.2",
+        "chalk": "^4.1.0",
+        "commander": "^7.2.0",
+        "fast-glob": "^3.2.5",
+        "find-up": "^5.0.0",
+        "fs-extra": "^9.1.0",
+        "require-from-string": "^2.0.2",
+        "resolve-from": "^5.0.0"
       },
-      "engines": {
-        "node": ">=8"
+      "bin": {
+        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
       }
     },
-    "node_modules/cssstyle/node_modules/cssom": {
-      "version": "0.3.8",
-      "resolved": "https://registry.npmjs.org/cssom/-/cssom-0.3.8.tgz",
-      "integrity": "sha512-b0tGHbfegbhPJpxpiBPU2sCkigAqtM9O121le6bbOlgyV+NyGyCmVfJ6QW9eRjz8CpNfWEOYBIMIGRYkLwsIYg=="
-    },
-    "node_modules/csstype": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/csstype/-/csstype-3.1.3.tgz",
-      "integrity": "sha512-M1uQkMl8rQK/szD0LNhtqxIPLpimGm8sOBwU7lLnCpSbTyY3yeU1Vc7l4KT5zT4s/yOxHH5O7tIuuLOCnLADRw==",
-      "devOptional": true
-    },
-    "node_modules/d64": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/d64/-/d64-1.0.0.tgz",
-      "integrity": "sha512-5eNy3WZziVYnrogqgXhcdEmqcDB2IHurTqLcrgssJsfkMVCUoUaZpK6cJjxxvLV2dUm5SuJMNcYfVGoin9UIRw==",
-      "peer": true
-    },
-    "node_modules/dag-map": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/dag-map/-/dag-map-1.0.2.tgz",
-      "integrity": "sha512-+LSAiGFwQ9dRnRdOeaj7g47ZFJcOUPukAP8J3A3fuZ1g9Y44BG+P1sgApjLXTQPOzC4+7S9Wr8kXsfpINM4jpw==",
-      "peer": true
-    },
-    "node_modules/data-urls": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/data-urls/-/data-urls-3.0.2.tgz",
-      "integrity": "sha512-Jy/tj3ldjZJo63sVAvg6LHt2mHvl4V6AgRAmNDtLdm7faqtsx+aJG42rsyCo9JCoRVKwPFzKlIPx3DIibwSIaQ==",
+    "node_modules/expo-modules-autolinking/node_modules/fs-extra": {
+      "version": "9.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
+      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
       "dependencies": {
-        "abab": "^2.0.6",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0"
+        "at-least-node": "^1.0.0",
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^6.0.1",
+        "universalify": "^2.0.0"
       },
       "engines": {
-        "node": ">=12"
+        "node": ">=10"
       }
     },
-    "node_modules/data-urls/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
+    "node_modules/expo-modules-autolinking/node_modules/jsonfile": {
+      "version": "6.1.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
+      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
       "dependencies": {
-        "punycode": "^2.1.1"
+        "universalify": "^2.0.0"
       },
-      "engines": {
-        "node": ">=12"
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/data-urls/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+    "node_modules/expo-modules-autolinking/node_modules/universalify": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
+      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "engines": {
-        "node": ">=12"
+        "node": ">= 10.0.0"
       }
     },
-    "node_modules/data-urls/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
+    "node_modules/expo-modules-core": {
+      "version": "2.2.2",
+      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-2.2.2.tgz",
+      "integrity": "sha512-SgjK86UD89gKAscRK3bdpn6Ojfs/KU4GujtuFx1wm4JaBjmXH4aakWkItkPlAV2pjIiHJHWQbENL9xjbw/Qr/g==",
+      "license": "MIT",
       "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
+        "invariant": "^2.2.4"
       }
     },
-    "node_modules/data-view-buffer": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-buffer/-/data-view-buffer-1.0.2.tgz",
-      "integrity": "sha512-EmKO5V3OLXh1rtK2wgXRansaK1/mtVdTUEiEI0W8RkvgT05kfxaH29PliLnpLP73yYO6142Q72QNa8Wx/A5CqQ==",
+    "node_modules/expo-router": {
+      "version": "4.0.17",
+      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-4.0.17.tgz",
+      "integrity": "sha512-8ybo6bVwdG1S9hafh9BTOjX1hpCgomdUvs6hKHMM01koo8mQ7zocH/+zxQeaMVDxGhboz2dO5GiDchWJ0OheRA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+        "@expo/metro-runtime": "4.0.1",
+        "@expo/server": "^0.5.1",
+        "@radix-ui/react-slot": "1.0.1",
+        "@react-navigation/bottom-tabs": "^7.2.0",
+        "@react-navigation/native": "^7.0.14",
+        "@react-navigation/native-stack": "^7.2.0",
+        "client-only": "^0.0.1",
+        "react-helmet-async": "^1.3.0",
+        "react-native-helmet-async": "2.0.4",
+        "react-native-is-edge-to-edge": "^1.1.6",
+        "schema-utils": "^4.0.1",
+        "semver": "~7.6.3",
+        "server-only": "^0.0.1"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "peerDependencies": {
+        "@react-navigation/drawer": "^7.1.1",
+        "expo": "*",
+        "expo-constants": "*",
+        "expo-linking": "*",
+        "react-native-reanimated": "*",
+        "react-native-safe-area-context": "*",
+        "react-native-screens": "*"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependenciesMeta": {
+        "@react-navigation/drawer": {
+          "optional": true
+        },
+        "@testing-library/jest-native": {
+          "optional": true
+        },
+        "react-native-reanimated": {
+          "optional": true
+        }
       }
     },
-    "node_modules/data-view-byte-length": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/data-view-byte-length/-/data-view-byte-length-1.0.2.tgz",
-      "integrity": "sha512-tuhGbE6CfTM9+5ANGf+oQb72Ky/0+s3xKUpHvShfiz2RxMFgFPjsXuRLBVMtvMs15awe45SRb83D6wH4ew6wlQ==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.2"
+    "node_modules/expo-router/node_modules/semver": {
+      "version": "7.6.3",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
+      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
+      "license": "ISC",
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/inspect-js"
+        "node": ">=10"
       }
     },
-    "node_modules/data-view-byte-offset": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/data-view-byte-offset/-/data-view-byte-offset-1.0.1.tgz",
-      "integrity": "sha512-BS8PfmtDGnrgYdOonGZQdLZslWIeCGFP9tpan0hi1Co2Zr2NKADsvGYA8XxuG/4UWgJ6Cjtv+YJnB6MM69QGlQ==",
+    "node_modules/expo-secure-store": {
+      "version": "14.0.1",
+      "resolved": "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-14.0.1.tgz",
+      "integrity": "sha512-QUS+j4+UG4jRQalgnpmTvvrFnMVLqPiUZRzYPnG3+JrZ5kwVW2w6YS3WWerPoR7C6g3y/a2htRxRSylsDs+TaQ==",
+      "license": "MIT",
+      "peerDependencies": {
+        "expo": "*"
+      }
+    },
+    "node_modules/expo-splash-screen": {
+      "version": "0.29.22",
+      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.29.22.tgz",
+      "integrity": "sha512-f+bPpF06bqiuW1Fbrd3nxeaSsmTVTBEKEYe3epYt4IE6y4Ulli3qEUamMLlRQiDGuIXPU6zQlscpy2mdBUI5cA==",
+      "license": "MIT",
       "dependencies": {
-        "call-bound": "^1.0.2",
-        "es-errors": "^1.3.0",
-        "is-data-view": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@expo/prebuild-config": "^8.0.27"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "expo": "*"
       }
     },
-    "node_modules/date-fns": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/date-fns/-/date-fns-4.1.0.tgz",
-      "integrity": "sha512-Ukq0owbQXxa/U3EGtsdVBkR1w7KOQ5gIBqdH2hkvknzZPYvBxb/aa6E8L7tmjFtkwZBu3UXBbjIgPo/Ez4xaNg==",
-      "license": "MIT",
-      "funding": {
-        "type": "github",
-        "url": "https://github.com/sponsors/kossnocorp"
+    "node_modules/expo-status-bar": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-2.0.1.tgz",
+      "integrity": "sha512-AkIPX7jWHRPp83UBZ1iXtVvyr0g+DgBVvIXTtlmPtmUsm8Vq9Bb5IGj86PW8osuFlgoTVAg7HI/+Ok7yEYwiRg==",
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/debug": {
-      "version": "4.4.0",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.4.0.tgz",
-      "integrity": "sha512-6WTZ/IxCY/T6BALoZHaE4ctp9xm+Z5kY/pzYaCHRFeyVhojxlrm+46y68HA6hr0TcwEssoxNiDEUJQjfPZ/RYA==",
+    "node_modules/expo-structured-headers": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-4.0.0.tgz",
+      "integrity": "sha512-uPiwZjWq3AdFGgY52+I2nGPrNa6izxAglymPXHUZLekZW290GqIUOk7MBNDD4sg4JwUbSi3gdxEurpEvuq+FSg==",
+      "license": "MIT"
+    },
+    "node_modules/expo-updates": {
+      "version": "0.27.1",
+      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.27.1.tgz",
+      "integrity": "sha512-1iCU/icvanYuJonHottHcTeYGxOAXcIOfeW0FXmELGLkliHpbXtFthmeiucIcdefgebIz3GxHk9CiTS0QrT7ZA==",
+      "license": "MIT",
       "dependencies": {
-        "ms": "^2.1.3"
+        "@expo/code-signing-certificates": "0.0.5",
+        "@expo/config": "~10.0.10",
+        "@expo/config-plugins": "~9.0.16",
+        "@expo/spawn-async": "^1.7.2",
+        "arg": "4.1.0",
+        "chalk": "^4.1.2",
+        "expo-eas-client": "~0.13.3",
+        "expo-manifests": "~0.15.7",
+        "expo-structured-headers": "~4.0.0",
+        "expo-updates-interface": "~1.0.0",
+        "fast-glob": "^3.3.2",
+        "fbemitter": "^3.0.0",
+        "ignore": "^5.3.1",
+        "resolve-from": "^5.0.0"
       },
-      "engines": {
-        "node": ">=6.0"
+      "bin": {
+        "expo-updates": "bin/cli.js"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "peerDependencies": {
+        "expo": "*",
+        "react": "*"
       }
     },
-    "node_modules/decimal.js": {
-      "version": "10.5.0",
-      "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.5.0.tgz",
-      "integrity": "sha512-8vDa8Qxvr/+d94hSh5P3IJwI5t8/c0KsMp+g8bNw9cY2icONa5aPfvKeieW1WlG0WQYwwhJ7mjui2xtiePQSXw=="
-    },
-    "node_modules/decode-uri-component": {
-      "version": "0.2.2",
-      "resolved": "https://registry.npmjs.org/decode-uri-component/-/decode-uri-component-0.2.2.tgz",
-      "integrity": "sha512-FqUYQ+8o158GyGTrMFJms9qh3CqTKvAqgqsTnkLI8sKu0028orqBhxNMFkFen0zGyg6epACD32pjVk58ngIErQ==",
+    "node_modules/expo-updates-interface": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-1.0.0.tgz",
+      "integrity": "sha512-93oWtvULJOj+Pp+N/lpTcFfuREX1wNeHtp7Lwn8EbzYYmdn37MvZU3TPW2tYYCZuhzmKEXnUblYcruYoDu7IrQ==",
       "license": "MIT",
-      "engines": {
-        "node": ">=0.10"
-      }
-    },
-    "node_modules/dedent": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/dedent/-/dedent-1.5.3.tgz",
-      "integrity": "sha512-NHQtfOOW68WD8lgypbLA5oT+Bt0xXJhiYvoR6SmmNXZfpzOGXwdKWmcwG8N7PwVVWV3eF/68nmD9BaJSsTBhyQ==",
       "peerDependencies": {
-        "babel-plugin-macros": "^3.1.0"
-      },
-      "peerDependenciesMeta": {
-        "babel-plugin-macros": {
-          "optional": true
-        }
+        "expo": "*"
       }
     },
-    "node_modules/deep-extend": {
-      "version": "0.6.0",
-      "resolved": "https://registry.npmjs.org/deep-extend/-/deep-extend-0.6.0.tgz",
-      "integrity": "sha512-LOHxIOaPYdHlJRtCQfDIVZtfw/ufM8+rVj649RIHzcm/vGwQRXFt6OPqIFWsm2XEMrNIEtWR64sY1LEKD2vAOA==",
-      "engines": {
-        "node": ">=4.0.0"
-      }
+    "node_modules/expo-updates/node_modules/arg": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
+      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
+      "license": "MIT"
     },
-    "node_modules/deep-is": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.4.tgz",
-      "integrity": "sha512-oIPzksmTg4/MriiaYGO+okXDT7ztn/w3Eptv/+gSIdMdKsJo0u4CfYNFJPy+4SKMuCqGw2wxnA+URMg3t8a/bQ==",
-      "dev": true
+    "node_modules/exponential-backoff": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
+      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
     },
-    "node_modules/deepmerge": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/deepmerge/-/deepmerge-4.3.1.tgz",
-      "integrity": "sha512-3sUqbMEc77XqpdNO7FRyRog+eW3ph+GYCbj+rK+uYyRMuwsVy0rMiVtPn+QJlKFvWP/1PYpapqYn0Me2knFn+A==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/fast-deep-equal": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
+      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
     },
-    "node_modules/default-gateway": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-4.2.0.tgz",
-      "integrity": "sha512-h6sMrVB1VMWVrW13mSc6ia/DwYYw5MN6+exNu1OaJeFac5aSAvwM7lZ0NVfTABuSkQelr4h5oebg3KB1XPdjgA==",
+    "node_modules/fast-glob": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
+      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
       "dependencies": {
-        "execa": "^1.0.0",
-        "ip-regex": "^2.1.0"
+        "@nodelib/fs.stat": "^2.0.2",
+        "@nodelib/fs.walk": "^1.2.3",
+        "glob-parent": "^5.1.2",
+        "merge2": "^1.3.0",
+        "micromatch": "^4.0.8"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8.6.0"
       }
     },
-    "node_modules/defaults": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/defaults/-/defaults-1.0.4.tgz",
-      "integrity": "sha512-eFuaLoy/Rxalv2kr+lqMlUnrDWV+3j4pljOIJgLIhI058IQfWJ7vXhyEIHu+HtC738klGALYxOKDO0bQP3tg8A==",
-      "dependencies": {
-        "clone": "^1.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
+    "node_modules/fast-json-stable-stringify": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
+      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
     },
-    "node_modules/deferred-leveldown": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/deferred-leveldown/-/deferred-leveldown-0.2.0.tgz",
-      "integrity": "sha512-+WCbb4+ez/SZ77Sdy1iadagFiVzMB89IKOBhglgnUkVxOxRWmmFsz8UDSNWh4Rhq+3wr/vMFlYj+rdEwWUDdng==",
-      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
-      "dependencies": {
-        "abstract-leveldown": "~0.12.1"
-      }
+    "node_modules/fast-levenshtein": {
+      "version": "2.0.6",
+      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
+      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
+      "dev": true
     },
-    "node_modules/deferred-leveldown/node_modules/abstract-leveldown": {
-      "version": "0.12.4",
-      "resolved": "https://registry.npmjs.org/abstract-leveldown/-/abstract-leveldown-0.12.4.tgz",
-      "integrity": "sha512-TOod9d5RDExo6STLMGa+04HGkl+TlMfbDnTyN93/ETJ9DpQ0DaYLqcMZlbXvdc4W3vVo1Qrl+WhSp8zvDsJ+jA==",
-      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
-      "dependencies": {
-        "xtend": "~3.0.0"
-      }
+    "node_modules/fast-loops": {
+      "version": "1.1.4",
+      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.4.tgz",
+      "integrity": "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg==",
+      "optional": true,
+      "peer": true
     },
-    "node_modules/deferred-leveldown/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-      "engines": {
-        "node": ">=0.4"
-      }
+    "node_modules/fast-uri": {
+      "version": "3.0.6",
+      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
+      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/fastify"
+        },
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/fastify"
+        }
+      ]
     },
-    "node_modules/define-data-property": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/define-data-property/-/define-data-property-1.1.4.tgz",
-      "integrity": "sha512-rBMvIzlpA8v6E+SJZoo++HAYqsLrkg7MSfIinMPFhmkorw7X+dOXVJQs+QT69zGkzMyfDnIMN2Wid1+NbL3T+A==",
+    "node_modules/fastq": {
+      "version": "1.19.0",
+      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
+      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
       "dependencies": {
-        "es-define-property": "^1.0.0",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "reusify": "^1.0.4"
       }
     },
-    "node_modules/define-lazy-prop": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/define-lazy-prop/-/define-lazy-prop-2.0.0.tgz",
-      "integrity": "sha512-Ds09qNh8yw3khSjiJjiUInaGX9xlqZDY7JVryGxdxV7NPeuqQfplOpQ66yJFZut3jLa5zOwkXw1g9EI2uKh4Og==",
-      "engines": {
-        "node": ">=8"
+    "node_modules/fb-watchman": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
+      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+      "dependencies": {
+        "bser": "2.1.1"
       }
     },
-    "node_modules/define-properties": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/define-properties/-/define-properties-1.2.1.tgz",
-      "integrity": "sha512-8QmQKqEASLd5nx0U1B1okLElbUuuttJ/AnYmRXbbbGDWh6uS208EjD4Xqq/I9wK7u0v6O08XhTWnt5XtEbR6Dg==",
+    "node_modules/fbemitter": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
+      "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
       "dependencies": {
-        "define-data-property": "^1.0.1",
-        "has-property-descriptors": "^1.0.0",
-        "object-keys": "^1.1.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "fbjs": "^3.0.0"
       }
     },
-    "node_modules/del": {
-      "version": "6.1.1",
-      "resolved": "https://registry.npmjs.org/del/-/del-6.1.1.tgz",
-      "integrity": "sha512-ua8BhapfP0JUJKC/zV9yHHDW/rDoDxP4Zhn3AkA6/xT6gY7jYXJiaeyBZznYVujhZZET+UgcbZiQ7sN3WqcImg==",
+    "node_modules/fbjs": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
+      "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
       "dependencies": {
-        "globby": "^11.0.1",
-        "graceful-fs": "^4.2.4",
-        "is-glob": "^4.0.1",
-        "is-path-cwd": "^2.2.0",
-        "is-path-inside": "^3.0.2",
-        "p-map": "^4.0.0",
-        "rimraf": "^3.0.2",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "cross-fetch": "^3.1.5",
+        "fbjs-css-vars": "^1.0.0",
+        "loose-envify": "^1.0.0",
+        "object-assign": "^4.1.0",
+        "promise": "^7.1.1",
+        "setimmediate": "^1.0.5",
+        "ua-parser-js": "^1.0.35"
       }
     },
-    "node_modules/delayed-stream": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/delayed-stream/-/delayed-stream-1.0.0.tgz",
-      "integrity": "sha512-ZySD7Nf91aLB0RxL4KGrKHBXl7Eds1DAmEdcoVawXnLD7SDhpNgtuII2aAkg7a7QS41jxPSZ17p4VdGnMHk3MQ==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
+    "node_modules/fbjs-css-vars": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
+      "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
     },
-    "node_modules/depd": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-2.0.0.tgz",
-      "integrity": "sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==",
-      "engines": {
-        "node": ">= 0.8"
+    "node_modules/fdir": {
+      "version": "6.4.3",
+      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
+      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
+      "dev": true,
+      "peerDependencies": {
+        "picomatch": "^3 || ^4"
+      },
+      "peerDependenciesMeta": {
+        "picomatch": {
+          "optional": true
+        }
       }
     },
-    "node_modules/destroy": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.2.0.tgz",
-      "integrity": "sha512-2sJGJTaXIIaR1w4iJSNoN0hnMY7Gpc/n8D4qSCJw8QqFWXf7cuAgnEHxBpweaVcPevC2l3KpjYCx3NypQQgaJg==",
-      "engines": {
-        "node": ">= 0.8",
-        "npm": "1.2.8000 || >= 1.4.16"
-      }
+    "node_modules/fetch-retry": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
+      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
     },
-    "node_modules/detect-libc": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/detect-libc/-/detect-libc-1.0.3.tgz",
-      "integrity": "sha512-pGjwhsmsp4kL2RTz08wcOlGN83otlqHeD/Z5T8GXZB+/YcpQ/dgo+lbU8ZsGxV0HIvqqxo9l7mqYwyYMD9bKDg==",
-      "bin": {
-        "detect-libc": "bin/detect-libc.js"
+    "node_modules/file-entry-cache": {
+      "version": "8.0.0",
+      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
+      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
+      "dev": true,
+      "dependencies": {
+        "flat-cache": "^4.0.0"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=16.0.0"
       }
     },
-    "node_modules/detect-newline": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/detect-newline/-/detect-newline-3.1.0.tgz",
-      "integrity": "sha512-TLz+x/vEXm/Y7P7wn1EJFNLxYpUD4TgMosxY6fAVJUnJMbupHBOncxyWUG9OpTaH9EBD7uFI5LfEgmMOc54DsA==",
+    "node_modules/fill-range": {
+      "version": "7.1.1",
+      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
+      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+      "dependencies": {
+        "to-regex-range": "^5.0.1"
+      },
       "engines": {
         "node": ">=8"
       }
     },
-    "node_modules/detect-node": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/detect-node/-/detect-node-2.1.0.tgz",
-      "integrity": "sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g=="
-    },
-    "node_modules/didyoumean": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/didyoumean/-/didyoumean-1.2.2.tgz",
-      "integrity": "sha512-gxtyfqMg7GKyhQmb056K7M3xszy/myH8w+B4RT+QXBQsvAOdc3XymqDDPHx1BgPgsdAA5SIifona89YtRATDzw=="
-    },
-    "node_modules/diff-sequences": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/diff-sequences/-/diff-sequences-29.6.3.tgz",
-      "integrity": "sha512-EjePK1srD3P08o2j4f0ExnylqRs5B9tJjcp9t1krH2qRi8CCdsYfwe9JgSLurFBWwq4uOlipzfk5fHNvwFKr8Q==",
+    "node_modules/filter-obj": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
+      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
+      "license": "MIT",
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/dir-glob": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/dir-glob/-/dir-glob-3.0.1.tgz",
-      "integrity": "sha512-WkrWp9GR4KXfKGYzOLmTuGVi1UWFfws377n9cc55/tb6DuqyF6pcQ5AbiHEshaDpY9v6oaSr2XCDidGmMwdzIA==",
+    "node_modules/finalhandler": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
+      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
       "dependencies": {
-        "path-type": "^4.0.0"
+        "debug": "2.6.9",
+        "encodeurl": "~1.0.2",
+        "escape-html": "~1.0.3",
+        "on-finished": "~2.3.0",
+        "parseurl": "~1.3.3",
+        "statuses": "~1.5.0",
+        "unpipe": "~1.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/dlv": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/dlv/-/dlv-1.1.3.tgz",
-      "integrity": "sha512-+HlytyjlPKnIG8XuRG8WvmBP8xs8P71y+SKKS6ZXWoEgLuePxtDoUEiH7WkdePWrQ5JBpE6aoVqfZfJUQkjXwA=="
-    },
-    "node_modules/dns-packet": {
-      "version": "5.6.1",
-      "resolved": "https://registry.npmjs.org/dns-packet/-/dns-packet-5.6.1.tgz",
-      "integrity": "sha512-l4gcSouhcgIKRvyy99RNVOgxXiicE+2jZoNmaNmZ6JXiGajBOJAesk1OBlJuM5k2c+eudGdLxDqXuPCKIj6kpw==",
+    "node_modules/finalhandler/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
       "dependencies": {
-        "@leichtgewicht/ip-codec": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=6"
+        "ms": "2.0.0"
       }
     },
-    "node_modules/dns.js": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dns.js/-/dns.js-1.0.1.tgz",
-      "integrity": "sha512-taQ05oSLPD0xY/zeOn21TfiinTrk2GjGyJC9q0WIohi7UiOWo9v8Io2kiNU1hpf1HyqX/SihAyDXkIW0cUt2ug=="
+    "node_modules/finalhandler/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/doctrine": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-2.1.0.tgz",
-      "integrity": "sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==",
+    "node_modules/find-babel-config": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.1.2.tgz",
+      "integrity": "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg==",
       "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "esutils": "^2.0.2"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "json5": "^2.2.3"
       }
     },
-    "node_modules/dom-converter": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/dom-converter/-/dom-converter-0.2.0.tgz",
-      "integrity": "sha512-gd3ypIPfOMr9h5jIKq8E3sHOTCjeirnl0WK5ZdS1AW0Odt0b1PaWaHdJ4Qk4klv+YB9aJBS7mESXjFoDQPu6DA==",
+    "node_modules/find-cache-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
+      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
       "dependencies": {
-        "utila": "~0.4"
+        "commondir": "^1.0.1",
+        "make-dir": "^2.0.0",
+        "pkg-dir": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/dom-serializer": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-2.0.0.tgz",
-      "integrity": "sha512-wIkAryiqt/nV5EQKqQpo3SToSOV9J0DnbJqwK7Wv/Trc92zIAYZ4FlMu+JPFW1DfGFt81ZTCGgDEabffXeLyJg==",
+    "node_modules/find-up": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
+      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
       "dependencies": {
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.2",
-        "entities": "^4.2.0"
+        "locate-path": "^6.0.0",
+        "path-exists": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       },
       "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/domain-browser": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/domain-browser/-/domain-browser-1.2.0.tgz",
-      "integrity": "sha512-jnjyiM6eRyZl2H+W8Q/zLMA481hzi0eszAaBUzIVnmYVDBbnLxVNnfu1HgEBvCbL+71FrxMl3E6lpKH7Ge3OXA==",
+    "node_modules/flat-cache": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
+      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
+      "dev": true,
+      "dependencies": {
+        "flatted": "^3.2.9",
+        "keyv": "^4.5.4"
+      },
       "engines": {
-        "node": ">=0.4",
-        "npm": ">=1.2"
+        "node": ">=16"
       }
     },
-    "node_modules/domelementtype": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/domelementtype/-/domelementtype-2.3.0.tgz",
-      "integrity": "sha512-OLETBj6w0OsagBwdXnPdN0cnMfF9opN69co+7ZrbfPGrdpPVNBUj02spi6B1N7wChLQiPn4CSH/zJvXw56gmHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ]
+    "node_modules/flatted": {
+      "version": "3.3.3",
+      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
+      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
+      "dev": true
     },
-    "node_modules/domexception": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/domexception/-/domexception-4.0.0.tgz",
-      "integrity": "sha512-A2is4PLG+eeSfoTMA95/s4pvAoSo2mKtiM5jlHkAVewmiO8ISFTFKZjH7UAM1Atli/OT/7JHOrJRJiMKUZKYBw==",
-      "deprecated": "Use your platform's native DOMException instead",
-      "dependencies": {
-        "webidl-conversions": "^7.0.0"
-      },
+    "node_modules/flow-enums-runtime": {
+      "version": "0.0.6",
+      "resolved": "https://registry.npmjs.org/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz",
+      "integrity": "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="
+    },
+    "node_modules/flow-parser": {
+      "version": "0.261.2",
+      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.261.2.tgz",
+      "integrity": "sha512-RtunoakA3YjtpAxPSOBVW6lmP5NYmETwkpAfNkdr8Ovf86ENkbD3mtPWnswFTIUtRvjwv0i8ZSkHK+AzsUg1JA==",
       "engines": {
-        "node": ">=12"
+        "node": ">=0.4.0"
       }
     },
-    "node_modules/domexception/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
+    "node_modules/follow-redirects": {
+      "version": "1.15.9",
+      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
+      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
+      "funding": [
+        {
+          "type": "individual",
+          "url": "https://github.com/sponsors/RubenVerborgh"
+        }
+      ],
+      "license": "MIT",
       "engines": {
-        "node": ">=12"
+        "node": ">=4.0"
+      },
+      "peerDependenciesMeta": {
+        "debug": {
+          "optional": true
+        }
       }
     },
-    "node_modules/domhandler": {
-      "version": "5.0.3",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-5.0.3.tgz",
-      "integrity": "sha512-cgwlv/1iFQiFnU96XXgROh8xTeetsnJiDsTc7TYCLFd9+/WNkIqPTxiM/8pSd8VIrhXGTf1Ny1q1hquVqDJB5w==",
+    "node_modules/fontfaceobserver": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz",
+      "integrity": "sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg=="
+    },
+    "node_modules/for-each": {
+      "version": "0.3.5",
+      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
+      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+      "dev": true,
       "dependencies": {
-        "domelementtype": "^2.3.0"
+        "is-callable": "^1.2.7"
       },
       "engines": {
-        "node": ">= 4"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/domutils": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-3.2.2.tgz",
-      "integrity": "sha512-6kZKyUajlDuqlHKVX1w7gyslj9MPIXzIFiz/rGu35uC1wMi+kMhQwGhl4lt9unC9Vb9INnY9Z3/ZA3+FhASLaw==",
+    "node_modules/foreground-child": {
+      "version": "3.3.0",
+      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
+      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
       "dependencies": {
-        "dom-serializer": "^2.0.0",
-        "domelementtype": "^2.3.0",
-        "domhandler": "^5.0.3"
+        "cross-spawn": "^7.0.0",
+        "signal-exit": "^4.0.1"
+      },
+      "engines": {
+        "node": ">=14"
       },
       "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/dot-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/dot-case/-/dot-case-3.0.4.tgz",
-      "integrity": "sha512-Kv5nKlh6yRrdrGvxeJ2e5y2eRUpkUosIW4A2AS38zwSz27zu7ufDwQPi5Jhs3XAlGNetl3bmnGhQsMtkKJnj3w==",
-      "license": "MIT",
+    "node_modules/form-data": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
+      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
       "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.35"
+      },
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/dotenv": {
-      "version": "16.4.7",
-      "resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.4.7.tgz",
-      "integrity": "sha512-47qPchRCykZC03FhkYAhrvwU4xDBFIj1QPqaarj6mdM/hgUzfPHcpkHJOn3mJAufFeeAxAzeGsr5X0M4k6fLZQ==",
+    "node_modules/freeport-async": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz",
+      "integrity": "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==",
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
+        "node": ">=8"
       }
     },
-    "node_modules/dotenv-expand": {
-      "version": "11.0.7",
-      "resolved": "https://registry.npmjs.org/dotenv-expand/-/dotenv-expand-11.0.7.tgz",
-      "integrity": "sha512-zIHwmZPRshsCdpMDyVsqGmgyP0yT8GAgXUnkdAoJisxvf33k7yO6OuoKmcTGuXPWSsm8Oh88nZicRLA9Y0rUeA==",
+    "node_modules/fresh": {
+      "version": "0.5.2",
+      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
+      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+      "engines": {
+        "node": ">= 0.6"
+      }
+    },
+    "node_modules/fs-extra": {
+      "version": "8.1.0",
+      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
+      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
       "dependencies": {
-        "dotenv": "^16.4.5"
+        "graceful-fs": "^4.2.0",
+        "jsonfile": "^4.0.0",
+        "universalify": "^0.1.0"
       },
       "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://dotenvx.com"
+        "node": ">=6 <7 || >=8"
       }
     },
-    "node_modules/dunder-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/dunder-proto/-/dunder-proto-1.0.1.tgz",
-      "integrity": "sha512-KIN/nDJBQRcXw0MLVhZE9iQHmG68qAVIBg9CqmUYjmQIhgij9U5MFvrqkUL5FbtyyzZuOeOt0zdeRe4UY7ct+A==",
+    "node_modules/fs-minipass": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
+      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "gopd": "^1.2.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/eastasianwidth": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/eastasianwidth/-/eastasianwidth-0.2.0.tgz",
-      "integrity": "sha512-I88TYZWc9XiYHRQ4/3c5rjjfgkjhLyW2luGIheGERbNQ6OY7yTybanSpDXZa8y7VUP9YmDcYa+eyq4ca7iLqWA=="
+    "node_modules/fs.realpath": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
+      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
     },
-    "node_modules/ee-first": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/ee-first/-/ee-first-1.1.1.tgz",
-      "integrity": "sha512-WMwm9LhRUo+WUaRN+vRuETqG89IgZphVSNkdFgeb6sS/E4OrDIN7t48CAewSHXc6C8lefD8KKfr5vY61brQlow=="
+    "node_modules/fsevents": {
+      "version": "2.3.3",
+      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
+      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
+      "hasInstallScript": true,
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
+      }
     },
-    "node_modules/electron-to-chromium": {
-      "version": "1.5.103",
-      "resolved": "https://registry.npmjs.org/electron-to-chromium/-/electron-to-chromium-1.5.103.tgz",
-      "integrity": "sha512-P6+XzIkfndgsrjROJWfSvVEgNHtPgbhVyTkwLjUM2HU/h7pZRORgaTlHqfAikqxKmdJMLW8fftrdGWbd/Ds0FA=="
+    "node_modules/function-bind": {
+      "version": "1.1.2",
+      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
+      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/emittery": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/emittery/-/emittery-0.13.1.tgz",
-      "integrity": "sha512-DeWwawk6r5yR9jFgnDKYt4sLS0LmHJJi3ZOnb5/JdbYwj3nW+FxQnHIjhBKz8YLC7oRNPVM9NQ47I3CVx34eqQ==",
+    "node_modules/function.prototype.name": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
+      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "functions-have-names": "^1.2.3",
+        "hasown": "^2.0.2",
+        "is-callable": "^1.2.7"
+      },
       "engines": {
-        "node": ">=12"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sindresorhus/emittery?sponsor=1"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/emoji-regex": {
-      "version": "9.2.2",
-      "resolved": "https://registry.npmjs.org/emoji-regex/-/emoji-regex-9.2.2.tgz",
-      "integrity": "sha512-L18DaJsXSUk2+42pv8mLs5jJT2hqFkFE4j21wOmgbUqsZ2hL72NsUU785g9RXgo3s0ZNgVl42TiHp3ZtOv/Vyg=="
-    },
-    "node_modules/emojis-list": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/emojis-list/-/emojis-list-3.0.0.tgz",
-      "integrity": "sha512-/kyM18EfinwXZbno9FyUGeFh87KC8HRQBQGildHZbEuRyWFOmv1U10o9BBp8XVZDVNNuQKyIGIu5ZYAAXJ0V2Q==",
-      "engines": {
-        "node": ">= 4"
+    "node_modules/functions-have-names": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
+      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
+      "dev": true,
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+    "node_modules/gensync": {
+      "version": "1.0.0-beta.2",
+      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
+      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/end-of-stream": {
-      "version": "1.4.4",
-      "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
-      "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dependencies": {
-        "once": "^1.4.0"
+        "node": ">=6.9.0"
       }
     },
-    "node_modules/engine.io-client": {
-      "version": "6.6.3",
-      "resolved": "https://registry.npmjs.org/engine.io-client/-/engine.io-client-6.6.3.tgz",
-      "integrity": "sha512-T0iLjnyNWahNyv/lcjS2y4oE358tVS/SYQNxYXGAJ9/GLgH4VCvOQ/mhTjqU88mLZCQgiG8RIegFHYCdVC+j5w==",
-      "dependencies": {
-        "@socket.io/component-emitter": "~3.1.0",
-        "debug": "~4.3.1",
-        "engine.io-parser": "~5.2.1",
-        "ws": "~8.17.1",
-        "xmlhttprequest-ssl": "~2.1.1"
+    "node_modules/get-caller-file": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
+      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
+      "engines": {
+        "node": "6.* || 8.* || >= 10.*"
       }
     },
-    "node_modules/engine.io-client/node_modules/debug": {
-      "version": "4.3.7",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-4.3.7.tgz",
-      "integrity": "sha512-Er2nc/H7RrMXZBFCEim6TCmMk02Z8vLC2Rbi1KEBggpo0fS6l0S1nnapwmIi3yW/+GOJap1Krg4w0Hg80oCqgQ==",
+    "node_modules/get-intrinsic": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
+      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
       "dependencies": {
-        "ms": "^2.1.3"
+        "call-bind-apply-helpers": "^1.0.2",
+        "es-define-property": "^1.0.1",
+        "es-errors": "^1.3.0",
+        "es-object-atoms": "^1.1.1",
+        "function-bind": "^1.1.2",
+        "get-proto": "^1.0.1",
+        "gopd": "^1.2.0",
+        "has-symbols": "^1.1.0",
+        "hasown": "^2.0.2",
+        "math-intrinsics": "^1.1.0"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "supports-color": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/engine.io-client/node_modules/ws": {
-      "version": "8.17.1",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-8.17.1.tgz",
-      "integrity": "sha512-6XQFvXTkbfUOZOKKILFG1PDK2NDQs4azKQl26T0YS5CxqWLgXajbPZ+h4gZekJyRqFU8pvnbAbbs/3TgRPy+GQ==",
+    "node_modules/get-package-type": {
+      "version": "0.1.0",
+      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
+      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
       "engines": {
-        "node": ">=10.0.0"
-      },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": ">=5.0.2"
-      },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+        "node": ">=8.0.0"
       }
     },
-    "node_modules/engine.io-parser": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/engine.io-parser/-/engine.io-parser-5.2.3.tgz",
-      "integrity": "sha512-HqD3yTBfnBxIrbnM1DoD6Pcq8NECnh8d4As1Qgh0z5Gg3jRRIqijury0CL3ghu/edArpUYiYqQiDUQBIs4np3Q==",
+    "node_modules/get-port": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
+      "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=4"
       }
     },
-    "node_modules/enhanced-resolve": {
-      "version": "5.18.1",
-      "resolved": "https://registry.npmjs.org/enhanced-resolve/-/enhanced-resolve-5.18.1.tgz",
-      "integrity": "sha512-ZSW3ma5GkcQBIpwZTSRAI8N71Uuwgs93IezB7mf7R60tC8ZbJideoDNKjHn2O9KIlx6rkGTTEk1xUCK2E1Y2Yg==",
+    "node_modules/get-proto": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
+      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
       "dependencies": {
-        "graceful-fs": "^4.2.4",
-        "tapable": "^2.2.0"
+        "dunder-proto": "^1.0.1",
+        "es-object-atoms": "^1.0.0"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/entities": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-4.5.0.tgz",
-      "integrity": "sha512-V0hjH4dGPh9Ao5p0MoRY6BVqtwCjhz6vI5LT8AJ55H+4g9/4vbHx1I54fS0XuclLhDHArPQCiMjDxjaL8fPxhw==",
-      "engines": {
-        "node": ">=0.12"
+    "node_modules/get-stream": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
+      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+      "dependencies": {
+        "pump": "^3.0.0"
       },
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/env-editor": {
-      "version": "0.4.2",
-      "resolved": "https://registry.npmjs.org/env-editor/-/env-editor-0.4.2.tgz",
-      "integrity": "sha512-ObFo8v4rQJAE59M69QzwloxPZtd33TpYEIjtKD1rrFDcM1Gd7IkDxEBU+HriziN6HSHQnBJi8Dmy+JWkav5HKA==",
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/eol": {
-      "version": "0.9.1",
-      "resolved": "https://registry.npmjs.org/eol/-/eol-0.9.1.tgz",
-      "integrity": "sha512-Ds/TEoZjwggRoz/Q2O7SE3i4Jm66mqTDfmdHdq/7DKVk3bro9Q8h6WdXKdPqFLMoqxrDK5SVRzHVPOS6uuGtrg=="
-    },
-    "node_modules/errno": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/errno/-/errno-0.1.8.tgz",
-      "integrity": "sha512-dJ6oBr5SQ1VSd9qkk7ByRgb/1SH4JZjCHSW/mr63/QcXO9zLVxvJ6Oy13nio03rxpSnVDDjFor75SjVeZWPW/A==",
+    "node_modules/get-symbol-description": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
+      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+      "dev": true,
       "dependencies": {
-        "prr": "~1.0.1"
+        "call-bound": "^1.0.3",
+        "es-errors": "^1.3.0",
+        "get-intrinsic": "^1.2.6"
       },
-      "bin": {
-        "errno": "cli.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/error-ex": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/error-ex/-/error-ex-1.3.2.tgz",
-      "integrity": "sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==",
+    "node_modules/get-tsconfig": {
+      "version": "4.10.0",
+      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
+      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
+      "dev": true,
       "dependencies": {
-        "is-arrayish": "^0.2.1"
+        "resolve-pkg-maps": "^1.0.0"
+      },
+      "funding": {
+        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
       }
     },
-    "node_modules/error-stack-parser": {
-      "version": "2.1.4",
-      "resolved": "https://registry.npmjs.org/error-stack-parser/-/error-stack-parser-2.1.4.tgz",
-      "integrity": "sha512-Sk5V6wVazPhq5MhpO+AUxJn5x7XSXGl1R93Vn7i+zS15KDVxQijejNCrz8340/2bgLBjR9GtEG8ZVKONDjcqGQ==",
-      "dependencies": {
-        "stackframe": "^1.3.4"
+    "node_modules/getenv": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
+      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==",
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/es-abstract": {
-      "version": "1.23.9",
-      "resolved": "https://registry.npmjs.org/es-abstract/-/es-abstract-1.23.9.tgz",
-      "integrity": "sha512-py07lI0wjxAC/DcfK1S6G7iANonniZwTISvdPzk9hzeH0IZIshbuuFxLIU96OyF89Yb9hiqWn8M/bY83KY5vzA==",
+    "node_modules/glob": {
+      "version": "10.4.5",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
+      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
       "dependencies": {
-        "array-buffer-byte-length": "^1.0.2",
-        "arraybuffer.prototype.slice": "^1.0.4",
-        "available-typed-arrays": "^1.0.7",
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "data-view-buffer": "^1.0.2",
-        "data-view-byte-length": "^1.0.2",
-        "data-view-byte-offset": "^1.0.1",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.0.0",
-        "es-set-tostringtag": "^2.1.0",
-        "es-to-primitive": "^1.3.0",
-        "function.prototype.name": "^1.1.8",
-        "get-intrinsic": "^1.2.7",
-        "get-proto": "^1.0.0",
-        "get-symbol-description": "^1.1.0",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "internal-slot": "^1.1.0",
-        "is-array-buffer": "^3.0.5",
-        "is-callable": "^1.2.7",
-        "is-data-view": "^1.0.2",
-        "is-regex": "^1.2.1",
-        "is-shared-array-buffer": "^1.0.4",
-        "is-string": "^1.1.1",
-        "is-typed-array": "^1.1.15",
-        "is-weakref": "^1.1.0",
-        "math-intrinsics": "^1.1.0",
-        "object-inspect": "^1.13.3",
-        "object-keys": "^1.1.1",
-        "object.assign": "^4.1.7",
-        "own-keys": "^1.0.1",
-        "regexp.prototype.flags": "^1.5.3",
-        "safe-array-concat": "^1.1.3",
-        "safe-push-apply": "^1.0.0",
-        "safe-regex-test": "^1.1.0",
-        "set-proto": "^1.0.0",
-        "string.prototype.trim": "^1.2.10",
-        "string.prototype.trimend": "^1.0.9",
-        "string.prototype.trimstart": "^1.0.8",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-length": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4",
-        "typed-array-length": "^1.0.7",
-        "unbox-primitive": "^1.1.0",
-        "which-typed-array": "^1.1.18"
+        "foreground-child": "^3.1.0",
+        "jackspeak": "^3.1.2",
+        "minimatch": "^9.0.4",
+        "minipass": "^7.1.2",
+        "package-json-from-dist": "^1.0.0",
+        "path-scurry": "^1.11.1"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "glob": "dist/esm/bin.mjs"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/es-define-property": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/es-define-property/-/es-define-property-1.0.1.tgz",
-      "integrity": "sha512-e3nRfgfUZ4rNGL232gUgX06QNyyez04KdjFrF+LTRoOXmrOgFKDg4BCdsjW8EnT69eqdYGmRpJwiPVYNrCaW3g==",
+    "node_modules/glob-parent": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
+      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+      "dependencies": {
+        "is-glob": "^4.0.1"
+      },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">= 6"
       }
     },
-    "node_modules/es-errors": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-errors/-/es-errors-1.3.0.tgz",
-      "integrity": "sha512-Zf5H2Kxt2xjTvbJvP2ZWLEICxA6j+hAmMzIlypy4xcBg1vKVnx89Wy0GbS+kf5cwCVFFzdCFh2XSCFNULS6csw==",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/glob-to-regexp": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
+      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==",
+      "peer": true
+    },
+    "node_modules/glob/node_modules/brace-expansion": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
+      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
+      "dependencies": {
+        "balanced-match": "^1.0.0"
       }
     },
-    "node_modules/es-iterator-helpers": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/es-iterator-helpers/-/es-iterator-helpers-1.2.1.tgz",
-      "integrity": "sha512-uDn+FE1yrDzyC0pCo961B2IHbdM8y/ACZsKD4dG6WqrjV53BADjwa7D+1aom2rsNVfLyDgU/eigvlJGJ08OQ4w==",
-      "dev": true,
+    "node_modules/glob/node_modules/minimatch": {
+      "version": "9.0.5",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
+      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.6",
-        "es-errors": "^1.3.0",
-        "es-set-tostringtag": "^2.0.3",
-        "function-bind": "^1.1.2",
-        "get-intrinsic": "^1.2.6",
-        "globalthis": "^1.0.4",
-        "gopd": "^1.2.0",
-        "has-property-descriptors": "^1.0.2",
-        "has-proto": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "internal-slot": "^1.1.0",
-        "iterator.prototype": "^1.1.4",
-        "safe-array-concat": "^1.1.3"
+        "brace-expansion": "^2.0.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=16 || 14 >=14.17"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/es-module-lexer": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/es-module-lexer/-/es-module-lexer-1.6.0.tgz",
-      "integrity": "sha512-qqnD1yMU6tk/jnaMosogGySTZP8YtUgAffA9nMN+E/rjxcfRQ6IEk7IiozUjgxKoFHBGjTLnrHB/YC45r/59EQ=="
+    "node_modules/globals": {
+      "version": "16.0.0",
+      "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
+      "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
+      "dev": true,
+      "engines": {
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
     },
-    "node_modules/es-object-atoms": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/es-object-atoms/-/es-object-atoms-1.1.1.tgz",
-      "integrity": "sha512-FGgH2h8zKNim9ljj7dankFPcICIK9Cp5bm+c2gQSYePhpaG5+esrLODihIorn+Pe6FGJzWhXQotPv73jTaldXA==",
+    "node_modules/globalthis": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
+      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
+      "dev": true,
       "dependencies": {
-        "es-errors": "^1.3.0"
+        "define-properties": "^1.2.1",
+        "gopd": "^1.0.1"
       },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-set-tostringtag": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/es-set-tostringtag/-/es-set-tostringtag-2.1.0.tgz",
-      "integrity": "sha512-j6vWzfrGVfyXxge+O0x5sh6cvxAog0a/4Rdd2K36zCMV5eJ+/+tOAngRO8cODMNWbVRdVlmGZQL2YS3yR8bIUA==",
+    "node_modules/globby": {
+      "version": "11.1.0",
+      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
+      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
       "dependencies": {
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
+        "array-union": "^2.1.0",
+        "dir-glob": "^3.0.1",
+        "fast-glob": "^3.2.9",
+        "ignore": "^5.2.0",
+        "merge2": "^1.4.1",
+        "slash": "^3.0.0"
+      },
+      "engines": {
+        "node": ">=10"
       },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
+      }
+    },
+    "node_modules/gopd": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
+      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-shim-unscopables": {
+    "node_modules/graceful-fs": {
+      "version": "4.2.11",
+      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
+      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
+    },
+    "node_modules/graphemer": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
+      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
+      "dev": true
+    },
+    "node_modules/graphql": {
+      "version": "15.8.0",
+      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz",
+      "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==",
+      "optional": true,
+      "peer": true,
+      "engines": {
+        "node": ">= 10.x"
+      }
+    },
+    "node_modules/has-bigints": {
       "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/es-shim-unscopables/-/es-shim-unscopables-1.1.0.tgz",
-      "integrity": "sha512-d9T8ucsEhh8Bi1woXCf+TIKDIROLG5WCkxg8geBCbvk22kzwC5G2OnXVMO6FUsvQlgUUXQ2itephWDLqDzbeCw==",
+      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
+      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
       "dev": true,
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
       "engines": {
         "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/es-to-primitive": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/es-to-primitive/-/es-to-primitive-1.3.0.tgz",
-      "integrity": "sha512-w+5mJ3GuFL+NjVtJlvydShqE1eN3h3PbI7/5LAsYJP/2qtuMXjfL2LpHSRqo4b4eSF5K/DH1JXKUAHSB2UW50g==",
-      "dependencies": {
-        "is-callable": "^1.2.7",
-        "is-date-object": "^1.0.5",
-        "is-symbol": "^1.0.4"
-      },
+    "node_modules/has-flag": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
+      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8"
+      }
+    },
+    "node_modules/has-property-descriptors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
+      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
+      "dev": true,
+      "dependencies": {
+        "es-define-property": "^1.0.0"
       },
       "funding": {
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escalade": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/escalade/-/escalade-3.2.0.tgz",
-      "integrity": "sha512-WUj2qlxaQtO4g6Pq5c29GTcWGDyd8itL8zTlipgECz3JesAiiOKotd8JU6otB3PACgG6xkJUyVhboMS+bje/jA==",
+    "node_modules/has-proto": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
+      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
+      "dev": true,
+      "dependencies": {
+        "dunder-proto": "^1.0.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escape-html": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/escape-html/-/escape-html-1.0.3.tgz",
-      "integrity": "sha512-NiSupZ4OeuGwr68lGIeym/ksIZMJodUGOSCZ/FSnTxcrekbvqrgdUxlJOMpijaKZVjAJrWrGs/6Jy8OMuyj9ow=="
-    },
-    "node_modules/escape-string-regexp": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
-      "integrity": "sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==",
+    "node_modules/has-symbols": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
+      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escodegen": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/escodegen/-/escodegen-2.1.0.tgz",
-      "integrity": "sha512-2NlIDTwUWJN0mRPQOdtQBzbUHvdGY2P1VXSyU83Q3xKxM7WHX2Ql8dKq782Q9TgQUNOLEzEYu9bzLNj1q88I5w==",
+    "node_modules/has-tostringtag": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
+      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
       "dependencies": {
-        "esprima": "^4.0.1",
-        "estraverse": "^5.2.0",
-        "esutils": "^2.0.2"
-      },
-      "bin": {
-        "escodegen": "bin/escodegen.js",
-        "esgenerate": "bin/esgenerate.js"
+        "has-symbols": "^1.0.3"
       },
       "engines": {
-        "node": ">=6.0"
+        "node": ">= 0.4"
       },
-      "optionalDependencies": {
-        "source-map": "~0.6.1"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/escodegen/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "optional": true,
+    "node_modules/hasown": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
+      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
+      "dependencies": {
+        "function-bind": "^1.1.2"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/eslint": {
-      "version": "9.21.0",
-      "resolved": "https://registry.npmjs.org/eslint/-/eslint-9.21.0.tgz",
-      "integrity": "sha512-KjeihdFqTPhOMXTt7StsDxriV4n66ueuF/jfPNC3j/lduHwr/ijDwJMsF+wyMJethgiKi5wniIE243vi07d3pg==",
-      "dev": true,
+    "node_modules/hermes-estree": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
+      "integrity": "sha512-eT5MU3f5aVhTqsfIReZ6n41X5sYn4IdQL0nvz6yO+MMlPxw49aSARHLg/MSehQftyjnrE8X6bYregzSumqc6cg=="
+    },
+    "node_modules/hermes-parser": {
+      "version": "0.23.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.23.1.tgz",
+      "integrity": "sha512-oxl5h2DkFW83hT4DAUJorpah8ou4yvmweUzLJmmr6YV2cezduCdlil1AvU/a/xSsAFo4WUcNA4GoV5Bvq6JffA==",
       "dependencies": {
-        "@eslint-community/eslint-utils": "^4.2.0",
-        "@eslint-community/regexpp": "^4.12.1",
-        "@eslint/config-array": "^0.19.2",
-        "@eslint/core": "^0.12.0",
-        "@eslint/eslintrc": "^3.3.0",
-        "@eslint/js": "9.21.0",
-        "@eslint/plugin-kit": "^0.2.7",
-        "@humanfs/node": "^0.16.6",
-        "@humanwhocodes/module-importer": "^1.0.1",
-        "@humanwhocodes/retry": "^0.4.2",
-        "@types/estree": "^1.0.6",
-        "@types/json-schema": "^7.0.15",
-        "ajv": "^6.12.4",
-        "chalk": "^4.0.0",
-        "cross-spawn": "^7.0.6",
-        "debug": "^4.3.2",
-        "escape-string-regexp": "^4.0.0",
-        "eslint-scope": "^8.2.0",
-        "eslint-visitor-keys": "^4.2.0",
-        "espree": "^10.3.0",
-        "esquery": "^1.5.0",
-        "esutils": "^2.0.2",
-        "fast-deep-equal": "^3.1.3",
-        "file-entry-cache": "^8.0.0",
-        "find-up": "^5.0.0",
-        "glob-parent": "^6.0.2",
-        "ignore": "^5.2.0",
-        "imurmurhash": "^0.1.4",
-        "is-glob": "^4.0.0",
-        "json-stable-stringify-without-jsonify": "^1.0.1",
-        "lodash.merge": "^4.6.2",
-        "minimatch": "^3.1.2",
-        "natural-compare": "^1.4.0",
-        "optionator": "^0.9.3"
-      },
-      "bin": {
-        "eslint": "bin/eslint.js"
-      },
-      "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://eslint.org/donate"
-      },
-      "peerDependencies": {
-        "jiti": "*"
-      },
-      "peerDependenciesMeta": {
-        "jiti": {
-          "optional": true
-        }
+        "hermes-estree": "0.23.1"
       }
     },
-    "node_modules/eslint-config-prettier": {
-      "version": "10.0.1",
-      "resolved": "https://registry.npmjs.org/eslint-config-prettier/-/eslint-config-prettier-10.0.1.tgz",
-      "integrity": "sha512-lZBts941cyJyeaooiKxAtzoPHTN+GbQTJFAIdQbRhA4/8whaAraEh47Whw/ZFfrjNSnlAxqfm9i0XVAEkULjCw==",
-      "dev": true,
-      "bin": {
-        "eslint-config-prettier": "build/bin/cli.js"
-      },
-      "peerDependencies": {
-        "eslint": ">=7.0.0"
+    "node_modules/hoist-non-react-statics": {
+      "version": "3.3.2",
+      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
+      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
+      "license": "BSD-3-Clause",
+      "dependencies": {
+        "react-is": "^16.7.0"
       }
     },
-    "node_modules/eslint-import-resolver-typescript": {
-      "version": "3.8.3",
-      "resolved": "https://registry.npmjs.org/eslint-import-resolver-typescript/-/eslint-import-resolver-typescript-3.8.3.tgz",
-      "integrity": "sha512-A0bu4Ks2QqDWNpeEgTQMPTngaMhuDu4yv6xpftBMAf+1ziXnpx+eSR1WRfoPTe2BAiAjHFZ7kSNx1fvr5g5pmQ==",
-      "dev": true,
+    "node_modules/hoist-non-react-statics/node_modules/react-is": {
+      "version": "16.13.1",
+      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
+      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
+      "license": "MIT"
+    },
+    "node_modules/hosted-git-info": {
+      "version": "7.0.2",
+      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
+      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
       "dependencies": {
-        "@nolyfill/is-core-module": "1.0.39",
-        "debug": "^4.3.7",
-        "enhanced-resolve": "^5.15.0",
-        "get-tsconfig": "^4.10.0",
-        "is-bun-module": "^1.0.2",
-        "stable-hash": "^0.0.4",
-        "tinyglobby": "^0.2.12"
+        "lru-cache": "^10.0.1"
       },
       "engines": {
-        "node": "^14.18.0 || >=16.0.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/unts/projects/eslint-import-resolver-ts"
-      },
-      "peerDependencies": {
-        "eslint": "*",
-        "eslint-plugin-import": "*",
-        "eslint-plugin-import-x": "*"
-      },
-      "peerDependenciesMeta": {
-        "eslint-plugin-import": {
-          "optional": true
-        },
-        "eslint-plugin-import-x": {
-          "optional": true
-        }
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/eslint-plugin-react": {
-      "version": "7.37.4",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react/-/eslint-plugin-react-7.37.4.tgz",
-      "integrity": "sha512-BGP0jRmfYyvOyvMoRX/uoUeW+GqNj9y16bPQzqAHf3AYII/tDs+jMN0dBVkl88/OZwNGwrVFxE7riHsXVfy/LQ==",
-      "dev": true,
+    "node_modules/hosted-git-info/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/html-encoding-sniffer": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
+      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
       "dependencies": {
-        "array-includes": "^3.1.8",
-        "array.prototype.findlast": "^1.2.5",
-        "array.prototype.flatmap": "^1.3.3",
-        "array.prototype.tosorted": "^1.1.4",
-        "doctrine": "^2.1.0",
-        "es-iterator-helpers": "^1.2.1",
-        "estraverse": "^5.3.0",
-        "hasown": "^2.0.2",
-        "jsx-ast-utils": "^2.4.1 || ^3.0.0",
-        "minimatch": "^3.1.2",
-        "object.entries": "^1.1.8",
-        "object.fromentries": "^2.0.8",
-        "object.values": "^1.2.1",
-        "prop-types": "^15.8.1",
-        "resolve": "^2.0.0-next.5",
-        "semver": "^6.3.1",
-        "string.prototype.matchall": "^4.0.12",
-        "string.prototype.repeat": "^1.0.0"
+        "whatwg-encoding": "^2.0.0"
       },
       "engines": {
-        "node": ">=4"
-      },
-      "peerDependencies": {
-        "eslint": "^3 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9.7"
+        "node": ">=12"
       }
     },
-    "node_modules/eslint-plugin-react-native": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native/-/eslint-plugin-react-native-5.0.0.tgz",
-      "integrity": "sha512-VyWlyCC/7FC/aONibOwLkzmyKg4j9oI8fzrk9WYNs4I8/m436JuOTAFwLvEn1CVvc7La4cPfbCyspP4OYpP52Q==",
-      "dev": true,
+    "node_modules/html-escaper": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
+      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
+    },
+    "node_modules/http-errors": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
+      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
       "dependencies": {
-        "eslint-plugin-react-native-globals": "^0.1.1"
+        "depd": "2.0.0",
+        "inherits": "2.0.4",
+        "setprototypeof": "1.2.0",
+        "statuses": "2.0.1",
+        "toidentifier": "1.0.1"
       },
-      "peerDependencies": {
-        "eslint": "^3.17.0 || ^4 || ^5 || ^6 || ^7 || ^8 || ^9"
+      "engines": {
+        "node": ">= 0.8"
       }
     },
-    "node_modules/eslint-plugin-react-native-globals": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/eslint-plugin-react-native-globals/-/eslint-plugin-react-native-globals-0.1.2.tgz",
-      "integrity": "sha512-9aEPf1JEpiTjcFAmmyw8eiIXmcNZOqaZyHO77wgm0/dWfT/oxC1SrIq8ET38pMxHYrcB6Uew+TzUVsBeczF88g==",
-      "dev": true
+    "node_modules/http-errors/node_modules/statuses": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
+      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+      "engines": {
+        "node": ">= 0.8"
+      }
     },
-    "node_modules/eslint-plugin-react/node_modules/resolve": {
-      "version": "2.0.0-next.5",
-      "resolved": "https://registry.npmjs.org/resolve/-/resolve-2.0.0-next.5.tgz",
-      "integrity": "sha512-U7WjGVG9sH8tvjW5SmGbQuui75FiyjAX72HX15DwBBwF9dNiQZRQAg9nnPhYy+TUnE0+VcrttuvNI8oSxZcocA==",
-      "dev": true,
+    "node_modules/http-proxy-agent": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
+      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
       "dependencies": {
-        "is-core-module": "^2.13.0",
-        "path-parse": "^1.0.7",
-        "supports-preserve-symlinks-flag": "^1.0.0"
-      },
-      "bin": {
-        "resolve": "bin/resolve"
+        "@tootallnate/once": "2",
+        "agent-base": "6",
+        "debug": "4"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-scope": {
-      "version": "8.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-8.2.0.tgz",
-      "integrity": "sha512-PHlWUfG6lvPc3yvP5A4PNyBL1W8fkDUccmI21JUu/+GKZBoH/W5u6usENXUrWFRsyoW5ACUjFGgAFQp5gUlb/A==",
-      "dev": true,
+    "node_modules/https-proxy-agent": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
+      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
       "dependencies": {
-        "esrecurse": "^4.3.0",
-        "estraverse": "^5.2.0"
+        "agent-base": "6",
+        "debug": "4"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">= 6"
       }
     },
-    "node_modules/eslint-visitor-keys": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/eslint-visitor-keys/-/eslint-visitor-keys-4.2.0.tgz",
-      "integrity": "sha512-UyLnSehNt62FFhSwjZlHmeokpRK59rcz29j+F1/aDgbkbRTk7wIc9XzdoasMUbRNKDM0qQt/+BJ4BrpFeABemw==",
-      "dev": true,
+    "node_modules/human-signals": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
+      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=10.17.0"
       }
     },
-    "node_modules/eslint/node_modules/glob-parent": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-6.0.2.tgz",
-      "integrity": "sha512-XxwI8EOhVQgWp6iDL+3b0r86f4d6AX6zSU55HfB4ydCEuXLXc5FcYeOu+nnGftS4TEju/11rt4KJPTMgbfmv4A==",
+    "node_modules/husky": {
+      "version": "9.1.7",
+      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
+      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
       "dev": true,
-      "dependencies": {
-        "is-glob": "^4.0.3"
+      "bin": {
+        "husky": "bin.js"
       },
       "engines": {
-        "node": ">=10.13.0"
+        "node": ">=18"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/typicode"
       }
     },
-    "node_modules/espree": {
-      "version": "10.3.0",
-      "resolved": "https://registry.npmjs.org/espree/-/espree-10.3.0.tgz",
-      "integrity": "sha512-0QYC8b24HWY8zjRnDTL6RiHfDbAWn63qb4LMj1Z4b076A4une81+z03Kg7l7mn/48PUTqoLptSXez8oknU8Clg==",
-      "dev": true,
-      "dependencies": {
-        "acorn": "^8.14.0",
-        "acorn-jsx": "^5.3.2",
-        "eslint-visitor-keys": "^4.2.0"
+    "node_modules/hyphenate-style-name": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
+      "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw==",
+      "optional": true,
+      "peer": true
+    },
+    "node_modules/iconv-lite": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
+      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
+      "dependencies": {
+        "safer-buffer": ">= 2.1.2 < 3.0.0"
       },
       "engines": {
-        "node": "^18.18.0 || ^20.9.0 || >=21.1.0"
-      },
-      "funding": {
-        "url": "https://opencollective.com/eslint"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/esprima": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/esprima/-/esprima-4.0.1.tgz",
-      "integrity": "sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==",
-      "bin": {
-        "esparse": "bin/esparse.js",
-        "esvalidate": "bin/esvalidate.js"
-      },
+    "node_modules/ieee754": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
+      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/feross"
+        },
+        {
+          "type": "patreon",
+          "url": "https://www.patreon.com/feross"
+        },
+        {
+          "type": "consulting",
+          "url": "https://feross.org/support"
+        }
+      ]
+    },
+    "node_modules/ignore": {
+      "version": "5.3.2",
+      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
+      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
       "engines": {
-        "node": ">=4"
+        "node": ">= 4"
       }
     },
-    "node_modules/esquery": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/esquery/-/esquery-1.6.0.tgz",
-      "integrity": "sha512-ca9pw9fomFcKPvFLXhBKUK90ZvGibiGOvRJNbjljY7s7uq/5YO4BOzcYtJqExdx99rF6aAcnRxHmcUHcz6sQsg==",
-      "dev": true,
+    "node_modules/image-size": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
+      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
       "dependencies": {
-        "estraverse": "^5.1.0"
+        "queue": "6.0.2"
+      },
+      "bin": {
+        "image-size": "bin/image-size.js"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": ">=16.x"
       }
     },
-    "node_modules/esrecurse": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/esrecurse/-/esrecurse-4.3.0.tgz",
-      "integrity": "sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag==",
+    "node_modules/immer": {
+      "version": "10.1.1",
+      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
+      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
+      "license": "MIT",
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/immer"
+      }
+    },
+    "node_modules/import-fresh": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
+      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
       "dependencies": {
-        "estraverse": "^5.2.0"
+        "caller-path": "^2.0.0",
+        "resolve-from": "^3.0.0"
       },
       "engines": {
-        "node": ">=4.0"
+        "node": ">=4"
       }
     },
-    "node_modules/estraverse": {
-      "version": "5.3.0",
-      "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-5.3.0.tgz",
-      "integrity": "sha512-MMdARuVEQziNTeJD8DgMqmhwR11BRQ/cBP+pLtYdSTnf3MIO8fFeiINEbX36ZdNlfU/7A9f3gUw49B3oQsvwBA==",
+    "node_modules/import-fresh/node_modules/resolve-from": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
+      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
       "engines": {
-        "node": ">=4.0"
+        "node": ">=4"
       }
     },
-    "node_modules/esutils": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/esutils/-/esutils-2.0.3.tgz",
-      "integrity": "sha512-kVscqXk4OCp68SZ0dkgEKVi6/8ij300KBWTJq32P/dYeWTSwK41WyTxalN1eRmA5Z9UU/LX9D7FWSmV9SAYx6g==",
+    "node_modules/import-local": {
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
+      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
+      "dependencies": {
+        "pkg-dir": "^4.2.0",
+        "resolve-cwd": "^3.0.0"
+      },
+      "bin": {
+        "import-local-fixture": "fixtures/cli.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/etag": {
-      "version": "1.8.1",
-      "resolved": "https://registry.npmjs.org/etag/-/etag-1.8.1.tgz",
-      "integrity": "sha512-aIL5Fx7mawVa300al2BnEE4iNvo1qETxLrPI/o05L7z6go7fCw1J6EQmbK4FmJ2AS7kgVF/KEZWufBfdClMcPg==",
+    "node_modules/import-local/node_modules/find-up": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
+      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
+      "dependencies": {
+        "locate-path": "^5.0.0",
+        "path-exists": "^4.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
       }
     },
-    "node_modules/event-target-shim": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/event-target-shim/-/event-target-shim-5.0.1.tgz",
-      "integrity": "sha512-i/2XbnSz/uxRCU6+NdVJgKWDTM427+MqYbkQzD321DuCQJUqOuJKIA0IM2+W2xtYHdKOmZ4dR6fExsd4SXL+WQ==",
+    "node_modules/import-local/node_modules/locate-path": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
+      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
+      "dependencies": {
+        "p-locate": "^4.1.0"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/eventemitter3": {
-      "version": "4.0.7",
-      "resolved": "https://registry.npmjs.org/eventemitter3/-/eventemitter3-4.0.7.tgz",
-      "integrity": "sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw=="
-    },
-    "node_modules/events": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/events/-/events-3.3.0.tgz",
-      "integrity": "sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==",
+    "node_modules/import-local/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
       "engines": {
-        "node": ">=0.8.x"
+        "node": ">=6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/exec-async": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/exec-async/-/exec-async-2.2.0.tgz",
-      "integrity": "sha512-87OpwcEiMia/DeiKFzaQNBNFeN3XkkpYIh9FyOqq5mS2oKv3CBE67PXoEKcr6nodWdXNogTiQ0jE2NGuoffXPw=="
-    },
-    "node_modules/execa": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-1.0.0.tgz",
-      "integrity": "sha512-adbxcyWV46qiHyvSp50TKt05tB4tK3HcmF7/nxfAdhnox83seTDbwnaqKO4sXRy7roHAIFqJP/Rw/AuEbX61LA==",
+    "node_modules/import-local/node_modules/p-locate": {
+      "version": "4.1.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
+      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
       "dependencies": {
-        "cross-spawn": "^6.0.0",
-        "get-stream": "^4.0.0",
-        "is-stream": "^1.1.0",
-        "npm-run-path": "^2.0.0",
-        "p-finally": "^1.0.0",
-        "signal-exit": "^3.0.0",
-        "strip-eof": "^1.0.0"
+        "p-limit": "^2.2.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/execa/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+    "node_modules/import-local/node_modules/pkg-dir": {
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
+      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "find-up": "^4.0.0"
       },
       "engines": {
-        "node": ">=4.8"
+        "node": ">=8"
       }
     },
-    "node_modules/execa/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+    "node_modules/imurmurhash": {
+      "version": "0.1.4",
+      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
+      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.8.19"
       }
     },
-    "node_modules/execa/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/indent-string": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
+      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/execa/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
+    "node_modules/inflight": {
+      "version": "1.0.6",
+      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
+      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
+      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
       "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
+        "once": "^1.3.0",
+        "wrappy": "1"
       }
     },
-    "node_modules/execa/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
+    "node_modules/inherits": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
-    "node_modules/execa/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
+    "node_modules/ini": {
+      "version": "1.3.8",
+      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
+      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
     },
-    "node_modules/execa/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/inline-style-prefixer": {
+      "version": "6.0.4",
+      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz",
+      "integrity": "sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
-        "isexe": "^2.0.0"
-      },
-      "bin": {
-        "which": "bin/which"
+        "css-in-js-utils": "^3.1.0",
+        "fast-loops": "^1.1.3"
       }
     },
-    "node_modules/exit": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/exit/-/exit-0.1.2.tgz",
-      "integrity": "sha512-Zk/eNKV2zbjpKzrsQ+n1G6poVbErQxJ0LBOJXaKZ1EViLzH+hrLu9cdXI4zw9dBQJslwBEpbQ2P1oS7nDxs6jQ==",
+    "node_modules/internal-ip": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
+      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
+      "dependencies": {
+        "default-gateway": "^4.2.0",
+        "ipaddr.js": "^1.9.0"
+      },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=6"
       }
     },
-    "node_modules/expect": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/expect/-/expect-29.7.0.tgz",
-      "integrity": "sha512-2Zks0hf1VLFYI1kbh0I5jP3KHHyCHpkfyHBzsSXRFgl/Bg9mWYfMW8oD+PdMPlEwy5HNsR9JutYy6pMeOh61nw==",
+    "node_modules/internal-slot": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
+      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
+      "dev": true,
       "dependencies": {
-        "@jest/expect-utils": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0"
+        "es-errors": "^1.3.0",
+        "hasown": "^2.0.2",
+        "side-channel": "^1.1.0"
       },
       "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/expo": {
-      "version": "52.0.37",
-      "resolved": "https://registry.npmjs.org/expo/-/expo-52.0.37.tgz",
-      "integrity": "sha512-fo37ClqjNLOVInerm7BU27H8lfPfeTC7Pmu72roPzq46DnJfs+KzTxTzE34GcJ0b6hMUx9FRSSGyTQqxzo2TVQ==",
+    "node_modules/invariant": {
+      "version": "2.2.4",
+      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
+      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
       "dependencies": {
-        "@babel/runtime": "^7.20.0",
-        "@expo/cli": "0.22.18",
-        "@expo/config": "~10.0.10",
-        "@expo/config-plugins": "~9.0.15",
-        "@expo/fingerprint": "0.11.11",
-        "@expo/metro-config": "0.19.11",
-        "@expo/vector-icons": "^14.0.0",
-        "babel-preset-expo": "~12.0.9",
-        "expo-asset": "~11.0.4",
-        "expo-constants": "~17.0.7",
-        "expo-file-system": "~18.0.11",
-        "expo-font": "~13.0.4",
-        "expo-keep-awake": "~14.0.3",
-        "expo-modules-autolinking": "2.0.8",
-        "expo-modules-core": "2.2.2",
-        "fbemitter": "^3.0.0",
-        "web-streams-polyfill": "^3.3.2",
-        "whatwg-url-without-unicode": "8.0.0-3"
-      },
-      "bin": {
-        "expo": "bin/cli"
-      },
-      "peerDependencies": {
-        "@expo/dom-webview": "*",
-        "@expo/metro-runtime": "*",
-        "react": "*",
-        "react-native": "*",
-        "react-native-webview": "*"
-      },
-      "peerDependenciesMeta": {
-        "@expo/dom-webview": {
-          "optional": true
-        },
-        "@expo/metro-runtime": {
-          "optional": true
-        },
-        "react-native-webview": {
-          "optional": true
-        }
+        "loose-envify": "^1.0.0"
       }
     },
-    "node_modules/expo-application": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/expo-application/-/expo-application-5.1.1.tgz",
-      "integrity": "sha512-aDatTcTTCdTbHw8h4/Tq2ilc6InM5ntF9xWCJdOcnUEcglxxGphVI/lzJKBaBF6mJECA8mEOjpVg2EGxOctTwg==",
-      "peer": true,
-      "peerDependencies": {
-        "expo": "*"
+    "node_modules/ip-regex": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
+      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
+      "engines": {
+        "node": ">=4"
       }
     },
-    "node_modules/expo-asset": {
-      "version": "11.0.4",
-      "resolved": "https://registry.npmjs.org/expo-asset/-/expo-asset-11.0.4.tgz",
-      "integrity": "sha512-CdIywU0HrR3wsW5c3n0cT3jW9hccZdnqGsRqY+EY/RWzJbDXtDfAQVEiFHO3mDK7oveUwrP2jK/6ZRNek41/sg==",
+    "node_modules/ipaddr.js": {
+      "version": "1.9.1",
+      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
+      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
+      "engines": {
+        "node": ">= 0.10"
+      }
+    },
+    "node_modules/is-array-buffer": {
+      "version": "3.0.5",
+      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
+      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
+      "dev": true,
       "dependencies": {
-        "@expo/image-utils": "^0.6.5",
-        "expo-constants": "~17.0.7",
-        "invariant": "^2.2.4",
-        "md5-file": "^3.2.3"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-av": {
-      "version": "14.0.7",
-      "resolved": "https://registry.npmjs.org/expo-av/-/expo-av-14.0.7.tgz",
-      "integrity": "sha512-FvKZxyy+2/qcCmp+e1GTK3s4zH8ZO1RfjpqNxh7ARlS1oH8HPtk1AyZAMo52tHz3yQ3UIqxQ2YbI9CFb4065lA==",
-      "peerDependencies": {
-        "expo": "*"
-      }
+    "node_modules/is-arrayish": {
+      "version": "0.2.1",
+      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
+      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
     },
-    "node_modules/expo-constants": {
-      "version": "17.0.7",
-      "resolved": "https://registry.npmjs.org/expo-constants/-/expo-constants-17.0.7.tgz",
-      "integrity": "sha512-sp5NUiV17I3JblVPIBDgoxgt7JIZS30vcyydCYHxsEoo+aKaeRYXxGYilCvb9lgI6BBwSL24sQ6ZjWsCWoF1VA==",
-      "license": "MIT",
+    "node_modules/is-async-function": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
+      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
+      "dev": true,
       "dependencies": {
-        "@expo/config": "~10.0.10",
-        "@expo/env": "~0.4.2"
+        "async-function": "^1.0.0",
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.1",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-crypto": {
-      "version": "13.0.2",
-      "resolved": "https://registry.npmjs.org/expo-crypto/-/expo-crypto-13.0.2.tgz",
-      "integrity": "sha512-7f/IMPYJZkBM21LNEMXGrNo/0uXSVfZTwufUdpNKedJR0fm5fH4DCSN79ZddlV26nF90PuXjK2inIbI6lb0qRA==",
+    "node_modules/is-bigint": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
+      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
+      "dev": true,
       "dependencies": {
-        "base64-js": "^1.3.0"
+        "has-bigints": "^1.0.2"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-eas-client": {
-      "version": "0.13.3",
-      "resolved": "https://registry.npmjs.org/expo-eas-client/-/expo-eas-client-0.13.3.tgz",
-      "integrity": "sha512-t+1F1tiDocSot8iSnrn/CjTUMvVvPV2DpafSVcticpbSzMGybEN7wcamO1t18fK7WxGXpZE9gxtd80qwv/LLqQ==",
-      "license": "MIT"
-    },
-    "node_modules/expo-file-system": {
-      "version": "18.0.11",
-      "resolved": "https://registry.npmjs.org/expo-file-system/-/expo-file-system-18.0.11.tgz",
-      "integrity": "sha512-yDwYfEzWgPXsBZHJW2RJ8Q66ceiFN9Wa5D20pp3fjXVkzPBDwxnYwiPWk4pVmCa5g4X5KYMoMne1pUrsL4OEpg==",
+    "node_modules/is-binary-path": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
+      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
       "dependencies": {
-        "web-streams-polyfill": "^3.3.2"
+        "binary-extensions": "^2.0.0"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/expo-font": {
-      "version": "13.0.4",
-      "resolved": "https://registry.npmjs.org/expo-font/-/expo-font-13.0.4.tgz",
-      "integrity": "sha512-eAP5hyBgC8gafFtprsz0HMaB795qZfgJWqTmU0NfbSin1wUuVySFMEPMOrTkTgmazU73v4Cb4x7p86jY1XXYUw==",
+    "node_modules/is-boolean-object": {
+      "version": "1.2.2",
+      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
+      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
+      "dev": true,
       "dependencies": {
-        "fontfaceobserver": "^2.1.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-image-loader": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/expo-image-loader/-/expo-image-loader-5.0.0.tgz",
-      "integrity": "sha512-Eg+5FHtyzv3Jjw9dHwu2pWy4xjf8fu3V0Asyy42kO+t/FbvW/vjUixpTjPtgKQLQh+2/9Nk4JjFDV6FwCnF2ZA==",
-      "peerDependencies": {
-        "expo": "*"
-      }
+    "node_modules/is-buffer": {
+      "version": "1.1.6",
+      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
+      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
     },
-    "node_modules/expo-image-picker": {
-      "version": "16.0.6",
-      "resolved": "https://registry.npmjs.org/expo-image-picker/-/expo-image-picker-16.0.6.tgz",
-      "integrity": "sha512-HN4xZirFjsFDIsWFb12AZh19fRzuvZjj2ll17cGr19VNRP06S/VPQU3Tdccn5vwUzQhOBlLu704CnNm278boiQ==",
+    "node_modules/is-bun-module": {
+      "version": "1.3.0",
+      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
+      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
+      "dev": true,
       "dependencies": {
-        "expo-image-loader": "~5.0.0"
-      },
-      "peerDependencies": {
-        "expo": "*"
+        "semver": "^7.6.3"
       }
     },
-    "node_modules/expo-json-utils": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/expo-json-utils/-/expo-json-utils-0.14.0.tgz",
-      "integrity": "sha512-xjGfK9dL0B1wLnOqNkX0jM9p48Y0I5xEPzHude28LY67UmamUyAACkqhZGaPClyPNfdzczk7Ej6WaRMT3HfXvw==",
-      "license": "MIT"
-    },
-    "node_modules/expo-keep-awake": {
-      "version": "14.0.3",
-      "resolved": "https://registry.npmjs.org/expo-keep-awake/-/expo-keep-awake-14.0.3.tgz",
-      "integrity": "sha512-6Jh94G6NvTZfuLnm2vwIpKe3GdOiVBuISl7FI8GqN0/9UOg9E0WXXp5cDcfAG8bn80RfgLJS8P7EPUGTZyOvhg==",
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
-      }
-    },
-    "node_modules/expo-linking": {
-      "version": "7.0.5",
-      "resolved": "https://registry.npmjs.org/expo-linking/-/expo-linking-7.0.5.tgz",
-      "integrity": "sha512-3KptlJtcYDPWohk0MfJU75MJFh2ybavbtcSd84zEPfw9s1q3hjimw3sXnH03ZxP54kiEWldvKmmnGcVffBDB1g==",
-      "license": "MIT",
-      "dependencies": {
-        "expo-constants": "~17.0.5",
-        "invariant": "^2.2.4"
+    "node_modules/is-bun-module/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "dev": true,
+      "bin": {
+        "semver": "bin/semver.js"
       },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
-    "node_modules/expo-location": {
-      "version": "18.0.10",
-      "resolved": "https://registry.npmjs.org/expo-location/-/expo-location-18.0.10.tgz",
-      "integrity": "sha512-R0Iioz0UZ9Ts8TACPngh8uDFbajJhVa5/igLqWB8Pq/gp8UHuwj7PC8XbZV7avsFoShYjaxrOhf4U7IONeKLgg==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+      "engines": {
+        "node": ">=10"
       }
     },
-    "node_modules/expo-manifests": {
-      "version": "0.15.7",
-      "resolved": "https://registry.npmjs.org/expo-manifests/-/expo-manifests-0.15.7.tgz",
-      "integrity": "sha512-IVzLcPamzUi4Br96xw6JPHaa1vjYupUnMqYyV1Mtd9VQojS5hJsf5VcVzbAMZE/cFGzWLZ1oJa6QXxYjN39Uww==",
-      "license": "MIT",
-      "dependencies": {
-        "@expo/config": "~10.0.10",
-        "expo-json-utils": "~0.14.0"
+    "node_modules/is-callable": {
+      "version": "1.2.7",
+      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
+      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
       },
-      "peerDependencies": {
-        "expo": "*"
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-modules-autolinking": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/expo-modules-autolinking/-/expo-modules-autolinking-2.0.8.tgz",
-      "integrity": "sha512-DezgnEYFQYic8hKGhkbztBA3QUmSftjaNDIKNAtS2iGJmzCcNIkatjN2slFDSWjSTNo8gOvPQyMKfyHWFvLpOQ==",
+    "node_modules/is-core-module": {
+      "version": "2.16.1",
+      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
+      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
       "dependencies": {
-        "@expo/spawn-async": "^1.7.2",
-        "chalk": "^4.1.0",
-        "commander": "^7.2.0",
-        "fast-glob": "^3.2.5",
-        "find-up": "^5.0.0",
-        "fs-extra": "^9.1.0",
-        "require-from-string": "^2.0.2",
-        "resolve-from": "^5.0.0"
+        "hasown": "^2.0.2"
       },
-      "bin": {
-        "expo-modules-autolinking": "bin/expo-modules-autolinking.js"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/fs-extra": {
-      "version": "9.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.1.0.tgz",
-      "integrity": "sha512-hcg3ZmepS30/7BSFqRvoo3DOMQu7IjqxO5nCDt+zM9XWjb33Wg7ziNT+Qvqbuc3+gWpzO02JubVyk2G4Zvo1OQ==",
+    "node_modules/is-data-view": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
+      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
+      "dev": true,
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^2.0.0"
+        "call-bound": "^1.0.2",
+        "get-intrinsic": "^1.2.6",
+        "is-typed-array": "^1.1.13"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-modules-autolinking/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+    "node_modules/is-date-object": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
+      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
+      "dev": true,
       "dependencies": {
-        "universalify": "^2.0.0"
+        "call-bound": "^1.0.2",
+        "has-tostringtag": "^1.0.2"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/expo-modules-autolinking/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-modules-core": {
-      "version": "2.2.2",
-      "resolved": "https://registry.npmjs.org/expo-modules-core/-/expo-modules-core-2.2.2.tgz",
-      "integrity": "sha512-SgjK86UD89gKAscRK3bdpn6Ojfs/KU4GujtuFx1wm4JaBjmXH4aakWkItkPlAV2pjIiHJHWQbENL9xjbw/Qr/g==",
-      "license": "MIT",
-      "dependencies": {
-        "invariant": "^2.2.4"
+    "node_modules/is-directory": {
+      "version": "0.3.1",
+      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
+      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-pwa": {
-      "version": "0.0.126",
-      "resolved": "https://registry.npmjs.org/expo-pwa/-/expo-pwa-0.0.126.tgz",
-      "integrity": "sha512-9qb6aIY0awez4FTyIiNhqyekb6sKnbvODOFCDPg23PqpkvdhuzzDRtP/Avgippt8kqRAgPpFXmIp2LaAyH1/aw==",
-      "dependencies": {
-        "@expo/image-utils": "0.3.23",
-        "chalk": "^4.0.0",
-        "commander": "2.20.0",
-        "update-check": "1.5.3"
-      },
+    "node_modules/is-docker": {
+      "version": "2.2.1",
+      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
+      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
       "bin": {
-        "expo-pwa": "build/cli.js"
+        "is-docker": "cli.js"
       },
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
-    "node_modules/expo-pwa/node_modules/@expo/image-utils": {
-      "version": "0.3.23",
-      "resolved": "https://registry.npmjs.org/@expo/image-utils/-/image-utils-0.3.23.tgz",
-      "integrity": "sha512-nhUVvW0TrRE4jtWzHQl8TR4ox7kcmrc2I0itaeJGjxF5A54uk7avgA0wRt7jP1rdvqQo1Ke1lXyLYREdhN9tPw==",
-      "dependencies": {
-        "@expo/spawn-async": "1.5.0",
-        "chalk": "^4.0.0",
-        "fs-extra": "9.0.0",
-        "getenv": "^1.0.0",
-        "jimp-compact": "0.16.1",
-        "mime": "^2.4.4",
-        "node-fetch": "^2.6.0",
-        "parse-png": "^2.1.0",
-        "resolve-from": "^5.0.0",
-        "semver": "7.3.2",
-        "tempy": "0.3.0"
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/expo-pwa/node_modules/@expo/spawn-async": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/@expo/spawn-async/-/spawn-async-1.5.0.tgz",
-      "integrity": "sha512-LB7jWkqrHo+5fJHNrLAFdimuSXQ2MQ4lA7SQW5bf/HbsXuV2VrT/jN/M8f/KoWt0uJMGN4k/j7Opx4AvOOxSew==",
-      "dependencies": {
-        "cross-spawn": "^6.0.5"
-      },
+    "node_modules/is-extglob": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
+      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-pwa/node_modules/commander": {
-      "version": "2.20.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-2.20.0.tgz",
-      "integrity": "sha512-7j2y+40w61zy6YC2iRNpUe/NwhNyoXrYpHMrSunaMG64nRnaf96zO/KMQR4OyN/UnE5KLyEBnKHd4aG3rskjpQ=="
-    },
-    "node_modules/expo-pwa/node_modules/cross-spawn": {
-      "version": "6.0.6",
-      "resolved": "https://registry.npmjs.org/cross-spawn/-/cross-spawn-6.0.6.tgz",
-      "integrity": "sha512-VqCUuhcd1iB+dsv8gxPttb5iZh/D0iubSP21g36KXdEuf6I5JiioesUVjpCdHV9MZRUfVFlvwtIUyPfxo5trtw==",
+    "node_modules/is-finalizationregistry": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
+      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
+      "dev": true,
       "dependencies": {
-        "nice-try": "^1.0.4",
-        "path-key": "^2.0.1",
-        "semver": "^5.5.0",
-        "shebang-command": "^1.2.0",
-        "which": "^1.2.9"
+        "call-bound": "^1.0.3"
       },
       "engines": {
-        "node": ">=4.8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/cross-spawn/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/is-fullwidth-code-point": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
+      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/expo-pwa/node_modules/crypto-random-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/crypto-random-string/-/crypto-random-string-1.0.0.tgz",
-      "integrity": "sha512-GsVpkFPlycH7/fRR7Dhcmnoii54gV1nz7y4CWyeFS14N+JVBBhY+r8amRHE4BwSYal7BPTDp8isvAlCxyFt3Hg==",
+    "node_modules/is-generator-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
+      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/expo-pwa/node_modules/fs-extra": {
-      "version": "9.0.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-9.0.0.tgz",
-      "integrity": "sha512-pmEYSk3vYsG/bF651KPUXZ+hvjpgWYw/Gc7W9NFUe3ZVLczKKWIij3IKpOrQcdw4TILtibFslZ0UmR8Vvzig4g==",
+    "node_modules/is-generator-function": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
+      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
+      "dev": true,
       "dependencies": {
-        "at-least-node": "^1.0.0",
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^6.0.1",
-        "universalify": "^1.0.0"
+        "call-bound": "^1.0.3",
+        "get-proto": "^1.0.0",
+        "has-tostringtag": "^1.0.2",
+        "safe-regex-test": "^1.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/jsonfile": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-6.1.0.tgz",
-      "integrity": "sha512-5dgndWOriYSm5cnYaJNhalLNDKOqFwyDB/rr1E9ZsGciGvKPs8R2xYGCacuf3z6K1YKDz182fd+fY3cn3pMqXQ==",
+    "node_modules/is-glob": {
+      "version": "4.0.3",
+      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
+      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
       "dependencies": {
-        "universalify": "^2.0.0"
+        "is-extglob": "^2.1.1"
       },
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/expo-pwa/node_modules/jsonfile/node_modules/universalify": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-2.0.1.tgz",
-      "integrity": "sha512-gptHNQghINnc/vTGIk0SOFGFNXw7JVrlRUtConJRlvaw6DuX0wO5Jeko9sWrMBhh+PsYAZ7oXAiOnf/UKogyiw==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-pwa/node_modules/mime": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-2.6.0.tgz",
-      "integrity": "sha512-USPkMeET31rOMiarsBNIHZKLGgvKc/LrjofAnBlOttf5ajRvqiRA8QsenbcooctK6d6Ts6aqZXBA+XbkKthiQg==",
-      "bin": {
-        "mime": "cli.js"
-      },
-      "engines": {
-        "node": ">=4.0.0"
+    "node_modules/is-map": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
+      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+    "node_modules/is-number": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
+      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
       "engines": {
-        "node": ">=4"
+        "node": ">=0.12.0"
       }
     },
-    "node_modules/expo-pwa/node_modules/semver": {
-      "version": "7.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.3.2.tgz",
-      "integrity": "sha512-OrOb32TeeambH6UrhtShmF7CRDqhL6/5XpPNp2DuRH6+9QLw/orhp72j87v8Qa1ScDkvrrBNpZcDejAirJmfXQ==",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/is-number-object": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
+      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
+      "dev": true,
+      "dependencies": {
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/shebang-command": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/shebang-command/-/shebang-command-1.2.0.tgz",
-      "integrity": "sha512-EV3L1+UQWGor21OmnvojK36mhg+TyIKDh3iFBKBohr5xeXIhNBcx8oWdgkTEEQ+BEFFYdLRuqMfd5L84N1V5Vg==",
-      "dependencies": {
-        "shebang-regex": "^1.0.0"
-      },
+    "node_modules/is-path-cwd": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
+      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=6"
       }
     },
-    "node_modules/expo-pwa/node_modules/shebang-regex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/shebang-regex/-/shebang-regex-1.0.0.tgz",
-      "integrity": "sha512-wpoSFAxys6b2a2wHZ1XpDSgD7N9iVjg29Ph9uV/uaP9Ex/KXlkTZTeddxDPSYQpgvzKLGJke2UU0AzoGCjNIvQ==",
+    "node_modules/is-path-inside": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
+      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=8"
       }
     },
-    "node_modules/expo-pwa/node_modules/temp-dir": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/temp-dir/-/temp-dir-1.0.0.tgz",
-      "integrity": "sha512-xZFXEGbG7SNC3itwBzI3RYjq/cEhBkx2hJuKGIUOcEULmkQExXiHat2z/qkISYsuR+IKumhEfKKbV5qXmhICFQ==",
+    "node_modules/is-plain-object": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
+      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
+      "dependencies": {
+        "isobject": "^3.0.1"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-pwa/node_modules/tempy": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/tempy/-/tempy-0.3.0.tgz",
-      "integrity": "sha512-WrH/pui8YCwmeiAoxV+lpRH9HpRtgBhSR2ViBPgpGb/wnYDzp21R4MN45fsCGvLROvY67o3byhJRYRONJyImVQ==",
+    "node_modules/is-potential-custom-element-name": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
+      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
+    },
+    "node_modules/is-regex": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
+      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
+      "dev": true,
       "dependencies": {
-        "temp-dir": "^1.0.0",
-        "type-fest": "^0.3.1",
-        "unique-string": "^1.0.0"
+        "call-bound": "^1.0.2",
+        "gopd": "^1.2.0",
+        "has-tostringtag": "^1.0.2",
+        "hasown": "^2.0.2"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/type-fest": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/type-fest/-/type-fest-0.3.1.tgz",
-      "integrity": "sha512-cUGJnCdr4STbePCgqNFbpVNCepa+kAVohJs1sLhxzdH+gnEoOd8VhbYa7pD3zZYGiURWM2xzEII3fQcRizDkYQ==",
+    "node_modules/is-set": {
+      "version": "2.0.3",
+      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
+      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
+      "dev": true,
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/unique-string": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/unique-string/-/unique-string-1.0.0.tgz",
-      "integrity": "sha512-ODgiYu03y5g76A1I9Gt0/chLCzQjvzDy7DsZGsLOE/1MrF6wriEskSncj1+/C58Xk/kPZDppSctDybCwOSaGAg==",
+    "node_modules/is-shared-array-buffer": {
+      "version": "1.0.4",
+      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
+      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
+      "dev": true,
       "dependencies": {
-        "crypto-random-string": "^1.0.0"
+        "call-bound": "^1.0.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-pwa/node_modules/universalify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/universalify/-/universalify-1.0.0.tgz",
-      "integrity": "sha512-rb6X1W158d7pRQBg5gkR8uPaSfiids68LTJQYOtEUhoJUWBdaQHsuT/EUduxXYxcrt4r5PJ4fuHW1MHT6p0qug==",
+    "node_modules/is-stream": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
+      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
       "engines": {
-        "node": ">= 10.0.0"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/expo-pwa/node_modules/which": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/which/-/which-1.3.1.tgz",
-      "integrity": "sha512-HxJdYWq1MTIQbJ3nw0cqssHoTNU267KlrDuGZ1WYlxDStUtKUhOaJmh112/TZmHxxUfuJqPXSOm7tDyas0OSIQ==",
+    "node_modules/is-string": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
+      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
+      "dev": true,
       "dependencies": {
-        "isexe": "^2.0.0"
+        "call-bound": "^1.0.3",
+        "has-tostringtag": "^1.0.2"
       },
-      "bin": {
-        "which": "bin/which"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-router": {
-      "version": "4.0.17",
-      "resolved": "https://registry.npmjs.org/expo-router/-/expo-router-4.0.17.tgz",
-      "integrity": "sha512-8ybo6bVwdG1S9hafh9BTOjX1hpCgomdUvs6hKHMM01koo8mQ7zocH/+zxQeaMVDxGhboz2dO5GiDchWJ0OheRA==",
-      "license": "MIT",
+    "node_modules/is-symbol": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
+      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
+      "dev": true,
       "dependencies": {
-        "@expo/metro-runtime": "4.0.1",
-        "@expo/server": "^0.5.1",
-        "@radix-ui/react-slot": "1.0.1",
-        "@react-navigation/bottom-tabs": "^7.2.0",
-        "@react-navigation/native": "^7.0.14",
-        "@react-navigation/native-stack": "^7.2.0",
-        "client-only": "^0.0.1",
-        "react-helmet-async": "^1.3.0",
-        "react-native-helmet-async": "2.0.4",
-        "react-native-is-edge-to-edge": "^1.1.6",
-        "schema-utils": "^4.0.1",
-        "semver": "~7.6.3",
-        "server-only": "^0.0.1"
+        "call-bound": "^1.0.2",
+        "has-symbols": "^1.1.0",
+        "safe-regex-test": "^1.1.0"
       },
-      "peerDependencies": {
-        "@react-navigation/drawer": "^7.1.1",
-        "expo": "*",
-        "expo-constants": "*",
-        "expo-linking": "*",
-        "react-native-reanimated": "*",
-        "react-native-safe-area-context": "*",
-        "react-native-screens": "*"
+      "engines": {
+        "node": ">= 0.4"
       },
-      "peerDependenciesMeta": {
-        "@react-navigation/drawer": {
-          "optional": true
-        },
-        "@testing-library/jest-native": {
-          "optional": true
-        },
-        "react-native-reanimated": {
-          "optional": true
-        }
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-router/node_modules/semver": {
-      "version": "7.6.3",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.6.3.tgz",
-      "integrity": "sha512-oVekP1cKtI+CTDvHWYFUcMtsK/00wmAEfyqKfNdARm8u1wNVhSgaX7A8d4UuIlUI5e84iEwOhs7ZPYRmzU9U6A==",
-      "license": "ISC",
-      "bin": {
-        "semver": "bin/semver.js"
+    "node_modules/is-typed-array": {
+      "version": "1.1.15",
+      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
+      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
+      "dev": true,
+      "dependencies": {
+        "which-typed-array": "^1.1.16"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-secure-store": {
-      "version": "14.0.1",
-      "resolved": "https://registry.npmjs.org/expo-secure-store/-/expo-secure-store-14.0.1.tgz",
-      "integrity": "sha512-QUS+j4+UG4jRQalgnpmTvvrFnMVLqPiUZRzYPnG3+JrZ5kwVW2w6YS3WWerPoR7C6g3y/a2htRxRSylsDs+TaQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
+    "node_modules/is-weakmap": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
+      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-splash-screen": {
-      "version": "0.29.22",
-      "resolved": "https://registry.npmjs.org/expo-splash-screen/-/expo-splash-screen-0.29.22.tgz",
-      "integrity": "sha512-f+bPpF06bqiuW1Fbrd3nxeaSsmTVTBEKEYe3epYt4IE6y4Ulli3qEUamMLlRQiDGuIXPU6zQlscpy2mdBUI5cA==",
-      "license": "MIT",
+    "node_modules/is-weakref": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
+      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
+      "dev": true,
       "dependencies": {
-        "@expo/prebuild-config": "^8.0.27"
+        "call-bound": "^1.0.3"
       },
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
-    "node_modules/expo-status-bar": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/expo-status-bar/-/expo-status-bar-2.0.1.tgz",
-      "integrity": "sha512-AkIPX7jWHRPp83UBZ1iXtVvyr0g+DgBVvIXTtlmPtmUsm8Vq9Bb5IGj86PW8osuFlgoTVAg7HI/+Ok7yEYwiRg==",
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/expo-structured-headers": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/expo-structured-headers/-/expo-structured-headers-4.0.0.tgz",
-      "integrity": "sha512-uPiwZjWq3AdFGgY52+I2nGPrNa6izxAglymPXHUZLekZW290GqIUOk7MBNDD4sg4JwUbSi3gdxEurpEvuq+FSg==",
-      "license": "MIT"
-    },
-    "node_modules/expo-updates": {
-      "version": "0.27.1",
-      "resolved": "https://registry.npmjs.org/expo-updates/-/expo-updates-0.27.1.tgz",
-      "integrity": "sha512-1iCU/icvanYuJonHottHcTeYGxOAXcIOfeW0FXmELGLkliHpbXtFthmeiucIcdefgebIz3GxHk9CiTS0QrT7ZA==",
-      "license": "MIT",
+    "node_modules/is-weakset": {
+      "version": "2.0.4",
+      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
+      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
+      "dev": true,
       "dependencies": {
-        "@expo/code-signing-certificates": "0.0.5",
-        "@expo/config": "~10.0.10",
-        "@expo/config-plugins": "~9.0.16",
-        "@expo/spawn-async": "^1.7.2",
-        "arg": "4.1.0",
-        "chalk": "^4.1.2",
-        "expo-eas-client": "~0.13.3",
-        "expo-manifests": "~0.15.7",
-        "expo-structured-headers": "~4.0.0",
-        "expo-updates-interface": "~1.0.0",
-        "fast-glob": "^3.3.2",
-        "fbemitter": "^3.0.0",
-        "ignore": "^5.3.1",
-        "resolve-from": "^5.0.0"
-      },
-      "bin": {
-        "expo-updates": "bin/cli.js"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react": "*"
-      }
-    },
-    "node_modules/expo-updates-interface": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/expo-updates-interface/-/expo-updates-interface-1.0.0.tgz",
-      "integrity": "sha512-93oWtvULJOj+Pp+N/lpTcFfuREX1wNeHtp7Lwn8EbzYYmdn37MvZU3TPW2tYYCZuhzmKEXnUblYcruYoDu7IrQ==",
-      "license": "MIT",
-      "peerDependencies": {
-        "expo": "*"
-      }
-    },
-    "node_modules/expo-updates/node_modules/arg": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/arg/-/arg-4.1.0.tgz",
-      "integrity": "sha512-ZWc51jO3qegGkVh8Hwpv636EkbesNV5ZNQPCtRa+0qytRYPEs9IYT9qITY9buezqUH5uqyzlWLcufrzU2rffdg==",
-      "license": "MIT"
-    },
-    "node_modules/exponential-backoff": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/exponential-backoff/-/exponential-backoff-3.1.2.tgz",
-      "integrity": "sha512-8QxYTVXUkuy7fIIoitQkPwGonB8F3Zj8eEO8Sqg9Zv/bkI7RJAzowee4gr81Hak/dUTpA2Z7VfQgoijjPNlUZA=="
-    },
-    "node_modules/express": {
-      "version": "4.21.2",
-      "resolved": "https://registry.npmjs.org/express/-/express-4.21.2.tgz",
-      "integrity": "sha512-28HqgMZAmih1Czt9ny7qr6ek2qddF4FclbMzwhCREB6OFfH+rXAnuNCwo1/wFvrtbgsQDb4kSbX9de9lFbrXnA==",
-      "dependencies": {
-        "accepts": "~1.3.8",
-        "array-flatten": "1.1.1",
-        "body-parser": "1.20.3",
-        "content-disposition": "0.5.4",
-        "content-type": "~1.0.4",
-        "cookie": "0.7.1",
-        "cookie-signature": "1.0.6",
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "finalhandler": "1.3.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "merge-descriptors": "1.0.3",
-        "methods": "~1.1.2",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "path-to-regexp": "0.1.12",
-        "proxy-addr": "~2.0.7",
-        "qs": "6.13.0",
-        "range-parser": "~1.2.1",
-        "safe-buffer": "5.2.1",
-        "send": "0.19.0",
-        "serve-static": "1.16.2",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "type-is": "~1.6.18",
-        "utils-merge": "1.0.1",
-        "vary": "~1.1.2"
+        "call-bound": "^1.0.3",
+        "get-intrinsic": "^1.2.6"
       },
       "engines": {
-        "node": ">= 0.10.0"
+        "node": ">= 0.4"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/express"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/express/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+    "node_modules/is-wsl": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
+      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
       "dependencies": {
-        "ms": "2.0.0"
+        "is-docker": "^2.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/express/node_modules/debug/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/isarray": {
+      "version": "2.0.5",
+      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
+      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==",
+      "dev": true
     },
-    "node_modules/express/node_modules/encodeurl": {
+    "node_modules/isexe": {
       "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-2.0.0.tgz",
-      "integrity": "sha512-Q0n9HRi4m6JuGIV1eFlmvJB7ZEVxu93IrMyiMsGC0lrMJMWzRgx6WGquyfQgZVb31vhGgXnfmPNNXmxnOkRBrg==",
+      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
+      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
+    },
+    "node_modules/isobject": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
+      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/express/node_modules/finalhandler": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.3.1.tgz",
-      "integrity": "sha512-6BN9trH7bp3qvnrRyzsBz+g3lZxTNZTbVO2EV1CS0WIcDbawYVdYvGflME/9QP0h0pYlCDBCTjYa9nZzMDpyxQ==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~2.0.0",
-        "escape-html": "~1.0.3",
-        "on-finished": "2.4.1",
-        "parseurl": "~1.3.3",
-        "statuses": "2.0.1",
-        "unpipe": "~1.0.0"
-      },
+    "node_modules/istanbul-lib-coverage": {
+      "version": "3.2.2",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
+      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/express/node_modules/on-finished": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.4.1.tgz",
-      "integrity": "sha512-oVlzkg3ENAhCk2zdv7IJwd/QUD4z2RxRwpkcGY8psCVcCYZNq4wYnVWALHM+brtuJjePWiYF/ClmuDr8Ch5+kg==",
+    "node_modules/istanbul-lib-instrument": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
+      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
       "dependencies": {
-        "ee-first": "1.1.1"
+        "@babel/core": "^7.12.3",
+        "@babel/parser": "^7.14.7",
+        "@istanbuljs/schema": "^0.1.2",
+        "istanbul-lib-coverage": "^3.2.0",
+        "semver": "^6.3.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=8"
       }
     },
-    "node_modules/express/node_modules/send": {
-      "version": "0.19.0",
-      "resolved": "https://registry.npmjs.org/send/-/send-0.19.0.tgz",
-      "integrity": "sha512-dW41u5VfLXu8SJh5bwRmyYUbAoSB3c9uQh6L8h/KtsFREPWpbX1lrljJo186Jc4nmci/sGUZ9a0a0J2zgfq2hw==",
+    "node_modules/istanbul-lib-report": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
+      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
       "dependencies": {
-        "debug": "2.6.9",
-        "depd": "2.0.0",
-        "destroy": "1.2.0",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "etag": "~1.8.1",
-        "fresh": "0.5.2",
-        "http-errors": "2.0.0",
-        "mime": "1.6.0",
-        "ms": "2.1.3",
-        "on-finished": "2.4.1",
-        "range-parser": "~1.2.1",
-        "statuses": "2.0.1"
+        "istanbul-lib-coverage": "^3.0.0",
+        "make-dir": "^4.0.0",
+        "supports-color": "^7.1.0"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": ">=10"
       }
     },
-    "node_modules/express/node_modules/send/node_modules/encodeurl": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/encodeurl/-/encodeurl-1.0.2.tgz",
-      "integrity": "sha512-TPJXq8JqFaVYm2CWmPvnP2Iyo4ZSM7/QKcSmuMLDObfpH5fi7RUGmd/rTDf+rut/saiDiQEeVTNgAmJEdAOx0w==",
+    "node_modules/istanbul-lib-report/node_modules/make-dir": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
+      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
+      "dependencies": {
+        "semver": "^7.5.3"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/express/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
+    "node_modules/istanbul-lib-report/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">=10"
       }
     },
-    "node_modules/fast-deep-equal": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz",
-      "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q=="
-    },
-    "node_modules/fast-glob": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/fast-glob/-/fast-glob-3.3.3.tgz",
-      "integrity": "sha512-7MptL8U0cqcFdzIzwOTHoilX9x5BrNqye7Z/LuC7kCMRio1EMSyqRK3BEAUD7sXRq4iT4AzTVuZdhgQ2TCvYLg==",
+    "node_modules/istanbul-lib-source-maps": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
+      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
       "dependencies": {
-        "@nodelib/fs.stat": "^2.0.2",
-        "@nodelib/fs.walk": "^1.2.3",
-        "glob-parent": "^5.1.2",
-        "merge2": "^1.3.0",
-        "micromatch": "^4.0.8"
+        "debug": "^4.1.1",
+        "istanbul-lib-coverage": "^3.0.0",
+        "source-map": "^0.6.1"
       },
       "engines": {
-        "node": ">=8.6.0"
+        "node": ">=10"
       }
     },
-    "node_modules/fast-json-stable-stringify": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz",
-      "integrity": "sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw=="
-    },
-    "node_modules/fast-levenshtein": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz",
-      "integrity": "sha512-DCXu6Ifhqcks7TZKY3Hxp3y6qphY5SJZmrWMDrKcERSOXWQdMhU9Ig/PYrzyw/ul9jOIyh0N4M0tbC5hodg8dw==",
-      "dev": true
-    },
-    "node_modules/fast-loops": {
-      "version": "1.1.4",
-      "resolved": "https://registry.npmjs.org/fast-loops/-/fast-loops-1.1.4.tgz",
-      "integrity": "sha512-8dbd3XWoKCTms18ize6JmQF1SFnnfj5s0B7rRry22EofgMu7B6LKHVh+XfFqFGsqnbH54xgeO83PzpKI+ODhlg=="
-    },
-    "node_modules/fast-uri": {
-      "version": "3.0.6",
-      "resolved": "https://registry.npmjs.org/fast-uri/-/fast-uri-3.0.6.tgz",
-      "integrity": "sha512-Atfo14OibSv5wAp4VWNsFYE1AchQRTv9cBGWET4pZWHzYshFSS9NQI6I57rdKn9croWVMbYFbLhJ+yJvmZIIHw==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fastify"
-        },
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/fastify"
-        }
-      ]
-    },
-    "node_modules/fastq": {
-      "version": "1.19.0",
-      "resolved": "https://registry.npmjs.org/fastq/-/fastq-1.19.0.tgz",
-      "integrity": "sha512-7SFSRCNjBQIZH/xZR3iy5iQYR8aGBE0h3VG6/cwlbrpdciNYBMotQav8c1XI3HjHH+NikUpP53nPdlZSdWmFzA==",
-      "dependencies": {
-        "reusify": "^1.0.4"
+    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/faye-websocket": {
-      "version": "0.11.4",
-      "resolved": "https://registry.npmjs.org/faye-websocket/-/faye-websocket-0.11.4.tgz",
-      "integrity": "sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==",
+    "node_modules/istanbul-reports": {
+      "version": "3.1.7",
+      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
+      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
       "dependencies": {
-        "websocket-driver": ">=0.5.1"
+        "html-escaper": "^2.0.0",
+        "istanbul-lib-report": "^3.0.0"
       },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/fb-watchman": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/fb-watchman/-/fb-watchman-2.0.2.tgz",
-      "integrity": "sha512-p5161BqbuCaSnB8jIbzQHOlpgsPmK5rJVDfDKO91Axs5NC1uu3HRQm6wt9cd9/+GtQQIO53JdGXXoyDpTAsgYA==",
+    "node_modules/iterator.prototype": {
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
+      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
+      "dev": true,
       "dependencies": {
-        "bser": "2.1.1"
+        "define-data-property": "^1.1.4",
+        "es-object-atoms": "^1.0.0",
+        "get-intrinsic": "^1.2.6",
+        "get-proto": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "set-function-name": "^2.0.2"
+      },
+      "engines": {
+        "node": ">= 0.4"
       }
     },
-    "node_modules/fbemitter": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/fbemitter/-/fbemitter-3.0.0.tgz",
-      "integrity": "sha512-KWKaceCwKQU0+HPoop6gn4eOHk50bBv/VxjJtGMfwmJt3D29JpN4H4eisCtIPA+a8GVBam+ldMMpMjJUvpDyHw==",
+    "node_modules/jackspeak": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
+      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
       "dependencies": {
-        "fbjs": "^3.0.0"
+        "@isaacs/cliui": "^8.0.2"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
+      },
+      "optionalDependencies": {
+        "@pkgjs/parseargs": "^0.11.0"
       }
     },
-    "node_modules/fbjs": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/fbjs/-/fbjs-3.0.5.tgz",
-      "integrity": "sha512-ztsSx77JBtkuMrEypfhgc3cI0+0h+svqeie7xHbh1k/IKdcydnvadp/mUaGgjAOXQmQSxsqgaRhS3q9fy+1kxg==",
+    "node_modules/jest": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
+      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
       "dependencies": {
-        "cross-fetch": "^3.1.5",
-        "fbjs-css-vars": "^1.0.0",
-        "loose-envify": "^1.0.0",
-        "object-assign": "^4.1.0",
-        "promise": "^7.1.1",
-        "setimmediate": "^1.0.5",
-        "ua-parser-js": "^1.0.35"
-      }
-    },
-    "node_modules/fbjs-css-vars": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/fbjs-css-vars/-/fbjs-css-vars-1.0.2.tgz",
-      "integrity": "sha512-b2XGFAFdWZWg0phtAWLHCk836A1Xann+I+Dgd3Gk64MHKZO44FfoD1KxyvbSh0qZsIoXQGGlVztIY+oitJPpRQ=="
-    },
-    "node_modules/fdir": {
-      "version": "6.4.3",
-      "resolved": "https://registry.npmjs.org/fdir/-/fdir-6.4.3.tgz",
-      "integrity": "sha512-PMXmW2y1hDDfTSRc9gaXIuCCRpuoz3Kaz8cUelp3smouvfT632ozg2vrT6lJsHKKOF59YLbOGfAWGUcKEfRMQw==",
-      "dev": true,
+        "@jest/core": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "import-local": "^3.0.2",
+        "jest-cli": "^29.7.0"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
       "peerDependencies": {
-        "picomatch": "^3 || ^4"
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
       },
       "peerDependenciesMeta": {
-        "picomatch": {
+        "node-notifier": {
           "optional": true
         }
       }
     },
-    "node_modules/fetch-retry": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/fetch-retry/-/fetch-retry-4.1.1.tgz",
-      "integrity": "sha512-e6eB7zN6UBSwGVwrbWVH+gdLnkW9WwHhmq2YDK1Sh30pzx1onRVGBvogTlUeWxwTa+L86NYdo4hFkh7O8ZjSnA=="
-    },
-    "node_modules/file-entry-cache": {
-      "version": "8.0.0",
-      "resolved": "https://registry.npmjs.org/file-entry-cache/-/file-entry-cache-8.0.0.tgz",
-      "integrity": "sha512-XXTUwCvisa5oacNGRP9SfNtYBNAMi+RPwBFmblZEF7N7swHYQS6/Zfk7SRwx4D5j3CH211YNRco1DEMNVfZCnQ==",
-      "dev": true,
+    "node_modules/jest-changed-files": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
+      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
       "dependencies": {
-        "flat-cache": "^4.0.0"
+        "execa": "^5.0.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0"
       },
       "engines": {
-        "node": ">=16.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fill-range": {
-      "version": "7.1.1",
-      "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-7.1.1.tgz",
-      "integrity": "sha512-YsGpe3WHLK8ZYi4tWDg2Jy3ebRz2rXowDxnld4bkQB00cc/1Zw9AWnC0i9ztDJitivtQvaI9KaLyKrc+hBW0yg==",
+    "node_modules/jest-changed-files/node_modules/execa": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
+      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
       "dependencies": {
-        "to-regex-range": "^5.0.1"
+        "cross-spawn": "^7.0.3",
+        "get-stream": "^6.0.0",
+        "human-signals": "^2.1.0",
+        "is-stream": "^2.0.0",
+        "merge-stream": "^2.0.0",
+        "npm-run-path": "^4.0.1",
+        "onetime": "^5.1.2",
+        "signal-exit": "^3.0.3",
+        "strip-final-newline": "^2.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sindresorhus/execa?sponsor=1"
       }
     },
-    "node_modules/filter-obj": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/filter-obj/-/filter-obj-1.1.0.tgz",
-      "integrity": "sha512-8rXg1ZnX7xzy2NGDVkBVaAy+lSlPNwad13BtgSlLuxfIslyt5Vg64U7tFcCt4WS1R0hvtnQybT/IyCkGZ3DpXQ==",
-      "license": "MIT",
+    "node_modules/jest-changed-files/node_modules/get-stream": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
+      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
       "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/finalhandler": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/finalhandler/-/finalhandler-1.1.2.tgz",
-      "integrity": "sha512-aAWcW57uxVNrQZqFXjITpW3sIUQmHGG3qSb9mUah9MgMC4NeWhNOlNjXEYq3HjRAvL6arUviZGGJsBg6z0zsWA==",
-      "dependencies": {
-        "debug": "2.6.9",
-        "encodeurl": "~1.0.2",
-        "escape-html": "~1.0.3",
-        "on-finished": "~2.3.0",
-        "parseurl": "~1.3.3",
-        "statuses": "~1.5.0",
-        "unpipe": "~1.0.0"
+        "node": ">=10"
       },
-      "engines": {
-        "node": ">= 0.8"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/finalhandler/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
+    "node_modules/jest-changed-files/node_modules/is-stream": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
+      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
+      "engines": {
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/finalhandler/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/find-babel-config": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/find-babel-config/-/find-babel-config-2.1.2.tgz",
-      "integrity": "sha512-ZfZp1rQyp4gyuxqt1ZqjFGVeVBvmpURMqdIWXbPRfB97Bf6BzdK/xSIbylEINzQ0kB5tlDQfn9HkNXXWsqTqLg==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "json5": "^2.2.3"
+    "node_modules/jest-changed-files/node_modules/mimic-fn": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
+      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/find-cache-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/find-cache-dir/-/find-cache-dir-2.1.0.tgz",
-      "integrity": "sha512-Tq6PixE0w/VMFfCgbONnkiQIVol/JJL7nRMi20fqzA4NRs9AfeqMGeRdPi3wIhYkxjeBaWh2rxwapn5Tu3IqOQ==",
+    "node_modules/jest-changed-files/node_modules/npm-run-path": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
+      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
       "dependencies": {
-        "commondir": "^1.0.1",
-        "make-dir": "^2.0.0",
-        "pkg-dir": "^3.0.0"
+        "path-key": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=8"
       }
     },
-    "node_modules/find-up": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-5.0.0.tgz",
-      "integrity": "sha512-78/PXT1wlLLDgTzDs7sjq9hzz0vXD+zn+7wypEe4fXQxCmdmqfGsEPQxmiCSQI3ajFV91bVSsvNtrJRiW6nGng==",
+    "node_modules/jest-changed-files/node_modules/onetime": {
+      "version": "5.1.2",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
+      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
       "dependencies": {
-        "locate-path": "^6.0.0",
-        "path-exists": "^4.0.0"
+        "mimic-fn": "^2.1.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": ">=6"
       },
       "funding": {
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/find-yarn-workspace-root": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/find-yarn-workspace-root/-/find-yarn-workspace-root-2.0.0.tgz",
-      "integrity": "sha512-1IMnbjt4KzsQfnhnzNd8wUEgXZ44IzZaZmnLYx7D5FZlaHt2gW20Cri8Q+E/t5tIj4+epTBub+2Zxu/vNILzqQ==",
-      "dependencies": {
-        "micromatch": "^4.0.2"
-      }
+    "node_modules/jest-changed-files/node_modules/signal-exit": {
+      "version": "3.0.7",
+      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
+      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/flat-cache": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/flat-cache/-/flat-cache-4.0.1.tgz",
-      "integrity": "sha512-f7ccFPK3SXFHpx15UIGyRJ/FJQctuKZ0zVuN3frBo4HnK3cay9VEW0R6yPYFHC0AgqhukPzKjq22t5DmAyqGyw==",
-      "dev": true,
+    "node_modules/jest-circus": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
+      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
       "dependencies": {
-        "flatted": "^3.2.9",
-        "keyv": "^4.5.4"
+        "@jest/environment": "^29.7.0",
+        "@jest/expect": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "co": "^4.6.0",
+        "dedent": "^1.0.0",
+        "is-generator-fn": "^2.0.0",
+        "jest-each": "^29.7.0",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "pretty-format": "^29.7.0",
+        "pure-rand": "^6.0.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
       "engines": {
-        "node": ">=16"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/flatted": {
-      "version": "3.3.3",
-      "resolved": "https://registry.npmjs.org/flatted/-/flatted-3.3.3.tgz",
-      "integrity": "sha512-GX+ysw4PBCz0PzosHDepZGANEuFCMLrnRTiEy9McGjmkCQYwRq4A/X786G/fjM/+OjsWSU1ZrY5qyARZmO/uwg==",
-      "dev": true
-    },
-    "node_modules/flow-enums-runtime": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/flow-enums-runtime/-/flow-enums-runtime-0.0.6.tgz",
-      "integrity": "sha512-3PYnM29RFXwvAN6Pc/scUfkI7RwhQ/xqyLUyPNlXUp9S40zI8nup9tUSrTLSVnWGBN38FNiGWbwZOB6uR4OGdw=="
-    },
-    "node_modules/flow-parser": {
-      "version": "0.261.2",
-      "resolved": "https://registry.npmjs.org/flow-parser/-/flow-parser-0.261.2.tgz",
-      "integrity": "sha512-RtunoakA3YjtpAxPSOBVW6lmP5NYmETwkpAfNkdr8Ovf86ENkbD3mtPWnswFTIUtRvjwv0i8ZSkHK+AzsUg1JA==",
-      "engines": {
-        "node": ">=0.4.0"
-      }
-    },
-    "node_modules/follow-redirects": {
-      "version": "1.15.9",
-      "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.9.tgz",
-      "integrity": "sha512-gew4GsXizNgdoRyqmyfMHyAmXsZDk6mHkSxZFCzW9gwlbtOW44CDtYavM+y+72qD/Vq2l550kMF52DT8fOLJqQ==",
-      "funding": [
-        {
-          "type": "individual",
-          "url": "https://github.com/sponsors/RubenVerborgh"
-        }
-      ],
-      "license": "MIT",
+    "node_modules/jest-cli": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
+      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
+      "dependencies": {
+        "@jest/core": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "create-jest": "^29.7.0",
+        "exit": "^0.1.2",
+        "import-local": "^3.0.2",
+        "jest-config": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "yargs": "^17.3.1"
+      },
+      "bin": {
+        "jest": "bin/jest.js"
+      },
       "engines": {
-        "node": ">=4.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
       },
       "peerDependenciesMeta": {
-        "debug": {
+        "node-notifier": {
           "optional": true
         }
       }
     },
-    "node_modules/fontfaceobserver": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/fontfaceobserver/-/fontfaceobserver-2.3.0.tgz",
-      "integrity": "sha512-6FPvD/IVyT4ZlNe7Wcn5Fb/4ChigpucKYSvD6a+0iMoLn2inpo711eyIcKjmDtE5XNcgAkSH9uN/nfAeZzHEfg=="
-    },
-    "node_modules/for-each": {
-      "version": "0.3.5",
-      "resolved": "https://registry.npmjs.org/for-each/-/for-each-0.3.5.tgz",
-      "integrity": "sha512-dKx12eRCVIzqCxFGplyFKJMPvLEWgmNtUrpTiJIR5u97zEhRG8ySrtboPHZXx7daLxQVrl643cTzbab2tkQjxg==",
+    "node_modules/jest-config": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
+      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
       "dependencies": {
-        "is-callable": "^1.2.7"
+        "@babel/core": "^7.11.6",
+        "@jest/test-sequencer": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-jest": "^29.7.0",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "deepmerge": "^4.2.2",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-circus": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-runner": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "parse-json": "^5.2.0",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-json-comments": "^3.1.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "@types/node": "*",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/foreach": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/foreach/-/foreach-2.0.6.tgz",
-      "integrity": "sha512-k6GAGDyqLe9JaebCsFCoudPPWfihKu8pylYXRlqP1J7ms39iPoTtk2fviNglIeQEwdh0bQeKJ01ZPyuyQvKzwg=="
-    },
-    "node_modules/foreground-child": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/foreground-child/-/foreground-child-3.3.0.tgz",
-      "integrity": "sha512-Ld2g8rrAyMYFXBhEqMz8ZAHBi4J4uS1i/CxGMDnjyFWddMXLVcDp051DZfu+t7+ab7Wv6SMqpWmyFIj5UbfFvg==",
+    "node_modules/jest-config/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dependencies": {
-        "cross-spawn": "^7.0.0",
-        "signal-exit": "^4.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=14"
+        "node": "*"
       },
       "funding": {
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/form-data": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-3.0.3.tgz",
-      "integrity": "sha512-q5YBMeWy6E2Un0nMGWMgI65MAKtaylxfNJGJxpGh45YDciZB4epbWpaAfImil6CPAPTYB4sh0URQNDRIZG5F2w==",
+    "node_modules/jest-config/node_modules/parse-json": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
+      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
       "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.35"
+        "@babel/code-frame": "^7.0.0",
+        "error-ex": "^1.3.1",
+        "json-parse-even-better-errors": "^2.3.0",
+        "lines-and-columns": "^1.1.6"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/forwarded": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/forwarded/-/forwarded-0.2.0.tgz",
-      "integrity": "sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==",
-      "engines": {
-        "node": ">= 0.6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/freeport-async": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/freeport-async/-/freeport-async-2.0.0.tgz",
-      "integrity": "sha512-K7od3Uw45AJg00XUmy15+Hae2hOcgKcmN3/EF6Y7i01O0gaqiRx8sUSpsb9+BRNL8RPBrhzPsVfy8q9ADlJuWQ==",
+    "node_modules/jest-config/node_modules/strip-json-comments": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
+      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
       "engines": {
         "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/fresh": {
-      "version": "0.5.2",
-      "resolved": "https://registry.npmjs.org/fresh/-/fresh-0.5.2.tgz",
-      "integrity": "sha512-zJ2mQYM18rEFOudeV4GShTGIQ7RbzA7ozbU9I/XBpm7kqgMywgmylMwXHxZJmkVoYkna9d2pVXVXPdYTP9ej8Q==",
+    "node_modules/jest-diff": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
+      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "diff-sequences": "^29.6.3",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs-extra": {
-      "version": "8.1.0",
-      "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
-      "integrity": "sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==",
+    "node_modules/jest-docblock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
+      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
       "dependencies": {
-        "graceful-fs": "^4.2.0",
-        "jsonfile": "^4.0.0",
-        "universalify": "^0.1.0"
+        "detect-newline": "^3.0.0"
       },
       "engines": {
-        "node": ">=6 <7 || >=8"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs-minipass": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/fs-minipass/-/fs-minipass-3.0.3.tgz",
-      "integrity": "sha512-XUBA9XClHbnJWSfBzjkm6RvPsyg3sryZt06BEQoXcF7EK/xpGaQYJgQKDJSUH5SGZ76Y7pFx1QBnXz09rU5Fbw==",
+    "node_modules/jest-each": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
+      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
       "dependencies": {
-        "minipass": "^7.0.3"
+        "@jest/types": "^29.6.3",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/fs-monkey": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/fs-monkey/-/fs-monkey-1.0.6.tgz",
-      "integrity": "sha512-b1FMfwetIKymC0eioW7mTywihSQE4oLzQn1dB6rZB5fx/3NpNEdAWeCSMB+60/AeT0TCXsxzAlcYVEFCTAksWg=="
-    },
-    "node_modules/fs.realpath": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
-      "integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
-    },
-    "node_modules/fsevents": {
-      "version": "2.3.3",
-      "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-2.3.3.tgz",
-      "integrity": "sha512-5xoDfX+fL7faATnagmWPpbFtwh/R77WmMMqqHGS65C3vvB0YHrgF+B1YmZ3441tMj5n63k0212XNoJwzlhffQw==",
-      "hasInstallScript": true,
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
+    "node_modules/jest-environment-jsdom": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
+      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/jsdom": "^20.0.0",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jsdom": "^20.0.0"
+      },
       "engines": {
-        "node": "^8.16.0 || ^10.6.0 || >=11.0.0"
-      }
-    },
-    "node_modules/function-bind": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/function-bind/-/function-bind-1.1.2.tgz",
-      "integrity": "sha512-7XHNxH7qX9xG5mIwxkhumTox/MIRNcOgDrxWsMt2pAr23WHp6MrRlN7FBSFpCpr+oVO0F744iUgR82nJMfG2SA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/function.prototype.name": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/function.prototype.name/-/function.prototype.name-1.1.8.tgz",
-      "integrity": "sha512-e5iwyodOHhbMr/yNrc7fDYG4qlbIvI5gajyzPnb5TCwyhjApznQh1BMFou9b30SevY43gCJKXycoCBjMbsuW0Q==",
+    "node_modules/jest-environment-node": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
+      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "functions-have-names": "^1.2.3",
-        "hasown": "^2.0.2",
-        "is-callable": "^1.2.7"
-      },
-      "engines": {
-        "node": ">= 0.4"
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-mock": "^29.7.0",
+        "jest-util": "^29.7.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/functions-have-names": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/functions-have-names/-/functions-have-names-1.2.3.tgz",
-      "integrity": "sha512-xckBUXyTIqT97tq2x2AMb+g163b5JFysYk0x4qxNFwbfQkmNZoiRHb6sPzI9/QV33WeuvVYBUIiD4NzNIyqaRQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/fwd-stream": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/fwd-stream/-/fwd-stream-1.0.4.tgz",
-      "integrity": "sha512-q2qaK2B38W07wfPSQDKMiKOD5Nzv2XyuvQlrmh1q0pxyHNanKHq8lwQ6n9zHucAwA5EbzRJKEgds2orn88rYTg==",
-      "dependencies": {
-        "readable-stream": "~1.0.26-4"
-      }
-    },
-    "node_modules/fwd-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
-    "node_modules/fwd-stream/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/gensync": {
-      "version": "1.0.0-beta.2",
-      "resolved": "https://registry.npmjs.org/gensync/-/gensync-1.0.0-beta.2.tgz",
-      "integrity": "sha512-3hN7NaskYvMDLQY55gnW3NQ+mesEAepTqlg+VEbj7zzqEMBVNhzcGYYeqFo/TlYz6eQiFcp1HcsCZO+nGgS8zg==",
-      "engines": {
-        "node": ">=6.9.0"
-      }
-    },
-    "node_modules/get-caller-file": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/get-caller-file/-/get-caller-file-2.0.5.tgz",
-      "integrity": "sha512-DyFP3BM/3YHTQOCUL/w0OZHR0lpKeGrxotcHWcqNEdnltqFwXVfhEBQ94eIo34AfQpo0rGki4cyIiftY06h2Fg==",
       "engines": {
-        "node": "6.* || 8.* || >= 10.*"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/get-intrinsic": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/get-intrinsic/-/get-intrinsic-1.3.0.tgz",
-      "integrity": "sha512-9fSjSaos/fRIVIp+xSJlE6lfwhES7LNtKaCBIamHsjr2na1BiABJPo0mOjjz8GJDURarmCPGqaiVg5mfjb98CQ==",
+    "node_modules/jest-expo": {
+      "version": "52.0.5",
+      "resolved": "https://registry.npmjs.org/jest-expo/-/jest-expo-52.0.5.tgz",
+      "integrity": "sha512-2jjdE81tWxH5PPe5SGR9rxLZbPtuM7ihEL+43xlJIjgxcplsMpFV9Nb8r5h3IpG+aVDjMiQXqF25n9dqqD09OQ==",
       "dependencies": {
-        "call-bind-apply-helpers": "^1.0.2",
-        "es-define-property": "^1.0.1",
-        "es-errors": "^1.3.0",
-        "es-object-atoms": "^1.1.1",
-        "function-bind": "^1.1.2",
-        "get-proto": "^1.0.1",
-        "gopd": "^1.2.0",
-        "has-symbols": "^1.1.0",
-        "hasown": "^2.0.2",
-        "math-intrinsics": "^1.1.0"
+        "@expo/config": "~10.0.10",
+        "@expo/json-file": "^9.0.2",
+        "@jest/create-cache-key-function": "^29.2.1",
+        "@jest/globals": "^29.2.1",
+        "babel-jest": "^29.2.1",
+        "fbemitter": "^3.0.0",
+        "find-up": "^5.0.0",
+        "jest-environment-jsdom": "^29.2.1",
+        "jest-snapshot": "^29.2.1",
+        "jest-watch-select-projects": "^2.0.0",
+        "jest-watch-typeahead": "2.2.1",
+        "json5": "^2.2.3",
+        "lodash": "^4.17.19",
+        "react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
+        "react-test-renderer": "18.3.1",
+        "server-only": "^0.0.1",
+        "stacktrace-js": "^2.0.2"
       },
-      "engines": {
-        "node": ">= 0.4"
+      "bin": {
+        "jest": "bin/jest.js"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/get-package-type": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/get-package-type/-/get-package-type-0.1.0.tgz",
-      "integrity": "sha512-pjzuKtY64GYfWizNAJ0fr9VqttZkNiK2iS430LtIHzjBEr6bX8Am2zm4sW4Ro5wjWW5cAlRL1qAMTcXbjNAO2Q==",
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/get-port": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/get-port/-/get-port-3.2.0.tgz",
-      "integrity": "sha512-x5UJKlgeUiNT8nyo/AcnwLnZuZNcSjSw0kogRB+Whd1fjjFq4B1hySFxSFWWSn4mIBzg3sRNUDFYc4g5gjPoLg==",
-      "engines": {
-        "node": ">=4"
+      "peerDependencies": {
+        "expo": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/get-proto": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/get-proto/-/get-proto-1.0.1.tgz",
-      "integrity": "sha512-sTSfBjoXBp89JvIKIefqw7U2CCebsc74kiY6awiGogKtoSGbgjYE/G/+l9sF3MWFPNc9IcoOC4ODfKHfxFmp0g==",
-      "dependencies": {
-        "dunder-proto": "^1.0.1",
-        "es-object-atoms": "^1.0.0"
-      },
+    "node_modules/jest-expo/node_modules/react": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-SMgWGY//7nO7F3HMuBfmC15Cr4vTe2tlpSCATfnz/wymSftDOKUqc+0smjRhcUeCFCc1zhOAWJ+N//U5CrmOzQ==",
+      "peer": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/get-stream": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-4.1.0.tgz",
-      "integrity": "sha512-GMat4EJ5161kIy2HevLlr4luNjBgvmj413KaQA7jt4V8B4RDsfpHk7WQ9GVqfYyyx8OS/L66Kox+rJRNklLK7w==",
+    "node_modules/jest-expo/node_modules/react-dom": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==",
+      "peer": true,
       "dependencies": {
-        "pump": "^3.0.0"
+        "scheduler": "0.25.0-rc-6230622a1a-20240610"
       },
-      "engines": {
-        "node": ">=6"
+      "peerDependencies": {
+        "react": "19.0.0-rc-6230622a1a-20240610"
       }
     },
-    "node_modules/get-symbol-description": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/get-symbol-description/-/get-symbol-description-1.1.0.tgz",
-      "integrity": "sha512-w9UMqWwJxHNOvoNzSJ2oPF5wvYcvP7jUvYzhp67yEhTi17ZDBBC1z9pTdGuzjD+EFIqLSYRweZjqfiPzQ06Ebg==",
+    "node_modules/jest-expo/node_modules/react-server-dom-webpack": {
+      "version": "19.0.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-nr+IsOVD07QdeCr4BLvR5TALfLaZLi9AIaoa6vXymBc051iDPWedJujYYrjRJy5+9jp9oCx3G8Tt/Bs//TckJw==",
       "dependencies": {
-        "call-bound": "^1.0.3",
-        "es-errors": "^1.3.0",
-        "get-intrinsic": "^1.2.6"
+        "acorn-loose": "^8.3.0",
+        "neo-async": "^2.6.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=0.10.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "react": "19.0.0-rc-6230622a1a-20240610",
+        "react-dom": "19.0.0-rc-6230622a1a-20240610",
+        "webpack": "^5.59.0"
       }
     },
-    "node_modules/get-tsconfig": {
-      "version": "4.10.0",
-      "resolved": "https://registry.npmjs.org/get-tsconfig/-/get-tsconfig-4.10.0.tgz",
-      "integrity": "sha512-kGzZ3LWWQcGIAmg6iWvXn0ei6WDtV26wzHRMwDSzmAbcXrTEXxHy6IehI6/4eT6VRKyMP1eF1VqwrVUmE/LR7A==",
-      "dev": true,
-      "dependencies": {
-        "resolve-pkg-maps": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/privatenumber/get-tsconfig?sponsor=1"
-      }
+    "node_modules/jest-expo/node_modules/scheduler": {
+      "version": "0.25.0-rc-6230622a1a-20240610",
+      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz",
+      "integrity": "sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==",
+      "peer": true
     },
-    "node_modules/getenv": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/getenv/-/getenv-1.0.0.tgz",
-      "integrity": "sha512-7yetJWqbS9sbn0vIfliPsFgoXMKn/YMF+Wuiog97x+urnSRRRZ7xB+uVkwGKzRgq9CDFfMQnE9ruL5DHv9c6Xg==",
+    "node_modules/jest-get-type": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
+      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
       "engines": {
-        "node": ">=6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob": {
-      "version": "10.4.5",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-10.4.5.tgz",
-      "integrity": "sha512-7Bv8RF0k6xjo7d4A/PxYLbUCfb6c+Vpd2/mB2yRDlew7Jb5hEXiCD9ibfO7wpk8i4sevK6DFny9h7EYbM3/sHg==",
+    "node_modules/jest-haste-map": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
+      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
       "dependencies": {
-        "foreground-child": "^3.1.0",
-        "jackspeak": "^3.1.2",
-        "minimatch": "^9.0.4",
-        "minipass": "^7.1.2",
-        "package-json-from-dist": "^1.0.0",
-        "path-scurry": "^1.11.1"
+        "@jest/types": "^29.6.3",
+        "@types/graceful-fs": "^4.1.3",
+        "@types/node": "*",
+        "anymatch": "^3.0.3",
+        "fb-watchman": "^2.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-regex-util": "^29.6.3",
+        "jest-util": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "micromatch": "^4.0.4",
+        "walker": "^1.0.8"
       },
-      "bin": {
-        "glob": "dist/esm/bin.mjs"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+      "optionalDependencies": {
+        "fsevents": "^2.3.2"
       }
     },
-    "node_modules/glob-parent": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/glob-parent/-/glob-parent-5.1.2.tgz",
-      "integrity": "sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==",
+    "node_modules/jest-leak-detector": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
+      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
       "dependencies": {
-        "is-glob": "^4.0.1"
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/glob-to-regexp": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz",
-      "integrity": "sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw=="
-    },
-    "node_modules/glob/node_modules/brace-expansion": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-2.0.1.tgz",
-      "integrity": "sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==",
-      "dependencies": {
-        "balanced-match": "^1.0.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/glob/node_modules/minimatch": {
-      "version": "9.0.5",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-9.0.5.tgz",
-      "integrity": "sha512-G6T0ZX48xgozx7587koeX9Ys2NYy6Gmv//P89sEte9V9whIapMNF4idKxnW2QtCcLiTWlb/wfCabAtAFWhhBow==",
-      "dependencies": {
-        "brace-expansion": "^2.0.1"
-      },
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/globals": {
-      "version": "16.0.0",
-      "resolved": "https://registry.npmjs.org/globals/-/globals-16.0.0.tgz",
-      "integrity": "sha512-iInW14XItCXET01CQFqudPOWP2jYMl7T+QRQT+UNcR/iQncN/F0UNpgd76iFkBPgNQb4+X3LV9tLJYzwh+Gl3A==",
-      "dev": true,
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/globalthis": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/globalthis/-/globalthis-1.0.4.tgz",
-      "integrity": "sha512-DpLKbNU4WylpxJykQujfCcwYWiV/Jhm50Goo0wrVILAv5jOr9d+H+UR3PhSCD2rCCEIg0uc+G+muBTwD54JhDQ==",
-      "dependencies": {
-        "define-properties": "^1.2.1",
-        "gopd": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/globby": {
-      "version": "11.1.0",
-      "resolved": "https://registry.npmjs.org/globby/-/globby-11.1.0.tgz",
-      "integrity": "sha512-jhIXaOzy1sb8IyocaruWSn1TjmnBVs8Ayhcy83rmxNJ8q2uWKCAj3CnJY+KpGSXCueAPc0i05kVvVKtP1t9S3g==",
-      "dependencies": {
-        "array-union": "^2.1.0",
-        "dir-glob": "^3.0.1",
-        "fast-glob": "^3.2.9",
-        "ignore": "^5.2.0",
-        "merge2": "^1.4.1",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/gopd": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/gopd/-/gopd-1.2.0.tgz",
-      "integrity": "sha512-ZUKRh6/kUFoAiTAtTYPZJ3hw9wNxx+BIBOijnlG9PnrJsCcSjs1wyyD6vJpaYtgnzDrKYRSqf3OO6Rfa93xsRg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/graceful-fs": {
-      "version": "4.2.11",
-      "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.2.11.tgz",
-      "integrity": "sha512-RbJ5/jmFcNNCcDV5o9eTnBLJ/HszWV0P73bc+Ff4nS/rJj+YaS6IGyiOL0VoBYX+l1Wrl3k63h/KrH+nhJ0XvQ=="
-    },
-    "node_modules/graphemer": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/graphemer/-/graphemer-1.4.0.tgz",
-      "integrity": "sha512-EtKwoO6kxCL9WO5xipiHTZlSzBm7WLT627TqC/uVRd0HKmq8NXyebnNYxDoBi7wt8eTWrUrKXCOVaFq9x1kgag==",
-      "dev": true
-    },
-    "node_modules/graphql": {
-      "version": "15.8.0",
-      "resolved": "https://registry.npmjs.org/graphql/-/graphql-15.8.0.tgz",
-      "integrity": "sha512-5gghUc24tP9HRznNpV2+FIoq3xKkj5dTQqf4v0CpdPbFVwFkWoxOM+o+2OC9ZSvjEMTjfmG9QT+gcvggTwW1zw==",
-      "peer": true,
-      "engines": {
-        "node": ">= 10.x"
-      }
-    },
-    "node_modules/graphql-tag": {
-      "version": "2.12.6",
-      "resolved": "https://registry.npmjs.org/graphql-tag/-/graphql-tag-2.12.6.tgz",
-      "integrity": "sha512-FdSNcu2QQcWnM2VNvSCCDCVS5PpPqpzgFT8+GXzqJuoDd0CBncxCY278u4mhRO7tMgo2JjgJA5aZ+nWSQ/Z+xg==",
-      "peer": true,
-      "dependencies": {
-        "tslib": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "peerDependencies": {
-        "graphql": "^0.9.0 || ^0.10.0 || ^0.11.0 || ^0.12.0 || ^0.13.0 || ^14.0.0 || ^15.0.0 || ^16.0.0"
-      }
-    },
-    "node_modules/handle-thing": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/handle-thing/-/handle-thing-2.0.1.tgz",
-      "integrity": "sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg=="
-    },
-    "node_modules/has-bigints": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-bigints/-/has-bigints-1.1.0.tgz",
-      "integrity": "sha512-R3pbpkcIqv2Pm3dUwgjclDRVmWpTJW2DcMzcIhEXEx1oh/CEMObMm3KLmRJOdvhM7o4uQBnwr8pzRK2sJWIqfg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-flag": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
-      "integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/has-property-descriptors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-property-descriptors/-/has-property-descriptors-1.0.2.tgz",
-      "integrity": "sha512-55JNKuIW+vq4Ke1BjOTjM2YctQIvCT7GFzHwmfZPGo5wnrgkid0YQtnAleFSqumZm4az3n2BS+erby5ipJdgrg==",
-      "dependencies": {
-        "es-define-property": "^1.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-proto": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/has-proto/-/has-proto-1.2.0.tgz",
-      "integrity": "sha512-KIL7eQPfHQRC8+XluaIw7BHUwwqL19bQn4hzNgdr+1wXoU0KKj6rufu47lhY7KbJR2C6T6+PfyN0Ea7wkSS+qQ==",
-      "dependencies": {
-        "dunder-proto": "^1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-symbols": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/has-symbols/-/has-symbols-1.1.0.tgz",
-      "integrity": "sha512-1cDNdwJ2Jaohmb3sg4OmKaMBwuC48sYni5HUw2DvsC8LjGTLK9h+eb1X6RyuOHe4hT0ULCW68iomhjUoKUqlPQ==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/has-tostringtag": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/has-tostringtag/-/has-tostringtag-1.0.2.tgz",
-      "integrity": "sha512-NqADB8VjPFLM2V0VvHUewwwsw0ZWBaIdgo+ieHtK3hasLz4qeCRjYcqfB6AQrBggRKppKF8L52/VqdVsO47Dlw==",
-      "dependencies": {
-        "has-symbols": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/hasown": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/hasown/-/hasown-2.0.2.tgz",
-      "integrity": "sha512-0hJU9SCPvmMzIBdZFqNPXWa6dqh7WdH0cII9y+CyS8rG3nL48Bclra9HmKhVVUHyPWNH5Y7xDwAB7bfgSjkUMQ==",
-      "dependencies": {
-        "function-bind": "^1.1.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/he": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/he/-/he-1.2.0.tgz",
-      "integrity": "sha512-F/1DnUGPopORZi0ni+CvrCgHQ5FyEAHRLSApuYWMmrbSwoN2Mn/7k+Gl38gJnR7yyDZk6WLXwiGod1JOWNDKGw==",
-      "bin": {
-        "he": "bin/he"
-      }
-    },
-    "node_modules/hermes-estree": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.23.1.tgz",
-      "integrity": "sha512-eT5MU3f5aVhTqsfIReZ6n41X5sYn4IdQL0nvz6yO+MMlPxw49aSARHLg/MSehQftyjnrE8X6bYregzSumqc6cg=="
-    },
-    "node_modules/hermes-parser": {
-      "version": "0.23.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.23.1.tgz",
-      "integrity": "sha512-oxl5h2DkFW83hT4DAUJorpah8ou4yvmweUzLJmmr6YV2cezduCdlil1AvU/a/xSsAFo4WUcNA4GoV5Bvq6JffA==",
-      "dependencies": {
-        "hermes-estree": "0.23.1"
-      }
-    },
-    "node_modules/hoist-non-react-statics": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/hoist-non-react-statics/-/hoist-non-react-statics-3.3.2.tgz",
-      "integrity": "sha512-/gGivxi8JPKWNm/W0jSmzcMPpfpPLc3dY/6GxhX2hQ9iGj3aDfklV4ET7NjKpSinLpJ5vafa9iiGIEZg10SfBw==",
-      "license": "BSD-3-Clause",
-      "dependencies": {
-        "react-is": "^16.7.0"
-      }
-    },
-    "node_modules/hoist-non-react-statics/node_modules/react-is": {
-      "version": "16.13.1",
-      "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
-      "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ==",
-      "license": "MIT"
-    },
-    "node_modules/hosted-git-info": {
-      "version": "7.0.2",
-      "resolved": "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-7.0.2.tgz",
-      "integrity": "sha512-puUZAUKT5m8Zzvs72XWy3HtvVbTWljRE66cP60bxJzAqf2DgICo7lYTY2IHUmLnNpjYvw5bvmoHvPc0QO2a62w==",
-      "dependencies": {
-        "lru-cache": "^10.0.1"
-      },
-      "engines": {
-        "node": "^16.14.0 || >=18.0.0"
-      }
-    },
-    "node_modules/hosted-git-info/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
-    },
-    "node_modules/hpack.js": {
-      "version": "2.1.6",
-      "resolved": "https://registry.npmjs.org/hpack.js/-/hpack.js-2.1.6.tgz",
-      "integrity": "sha512-zJxVehUdMGIKsRaNt7apO2Gqp0BdqW5yaiGHXXmbpvxgBYVZnAql+BJb4RO5ad2MgpbZKn5G6nMnegrH1FcNYQ==",
-      "dependencies": {
-        "inherits": "^2.0.1",
-        "obuf": "^1.0.0",
-        "readable-stream": "^2.0.1",
-        "wbuf": "^1.1.0"
-      }
-    },
-    "node_modules/hpack.js/node_modules/isarray": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha512-VLghIWNM6ELQzo7zwmcg0NmTVyWKYjvIeM83yjp0wRDTmUnrM678fQbcKBo6n2CJEF0szoG//ytg+TKla89ALQ=="
-    },
-    "node_modules/hpack.js/node_modules/readable-stream": {
-      "version": "2.3.8",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.8.tgz",
-      "integrity": "sha512-8p0AUk4XODgIewSi0l8Epjs+EVnWiK7NoDIEGU0HhE7+ZyY8D1IMY7odu5lRrFXGg71L15KG8QrPmum45RTtdA==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.3",
-        "isarray": "~1.0.0",
-        "process-nextick-args": "~2.0.0",
-        "safe-buffer": "~5.1.1",
-        "string_decoder": "~1.1.1",
-        "util-deprecate": "~1.0.1"
-      }
-    },
-    "node_modules/hpack.js/node_modules/safe-buffer": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
-    },
-    "node_modules/hpack.js/node_modules/string_decoder": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
-      "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dependencies": {
-        "safe-buffer": "~5.1.0"
-      }
-    },
-    "node_modules/html-encoding-sniffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/html-encoding-sniffer/-/html-encoding-sniffer-3.0.0.tgz",
-      "integrity": "sha512-oWv4T4yJ52iKrufjnyZPkrN0CH3QnrUqdB6In1g5Fe1mia8GmF36gnfNySxoZtxD5+NmYw1EElVXiBk93UeskA==",
-      "dependencies": {
-        "whatwg-encoding": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-entities": {
-      "version": "2.6.0",
-      "resolved": "https://registry.npmjs.org/html-entities/-/html-entities-2.6.0.tgz",
-      "integrity": "sha512-kig+rMn/QOVRvr7c86gQ8lWXq+Hkv6CbAH1hLu+RG338StTpE8Z0b44SDVaqVu7HGKf27frdmUYEs9hTUX/cLQ==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/mdevils"
-        },
-        {
-          "type": "patreon",
-          "url": "https://patreon.com/mdevils"
-        }
-      ]
-    },
-    "node_modules/html-escaper": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/html-escaper/-/html-escaper-2.0.2.tgz",
-      "integrity": "sha512-H2iMtd0I4Mt5eYiapRdIDjp+XzelXQ0tFE4JS7YFwFevXXMmOp9myNrUvCg0D6ws8iqkRPBfKHgbwig1SmlLfg=="
-    },
-    "node_modules/html-minifier-terser": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/html-minifier-terser/-/html-minifier-terser-6.1.0.tgz",
-      "integrity": "sha512-YXxSlJBZTP7RS3tWnQw74ooKa6L9b9i9QYXY21eUEvhZ3u9XLfv6OnFsQq6RxkhHygsaUMvYsZRV5rU/OVNZxw==",
-      "dependencies": {
-        "camel-case": "^4.1.2",
-        "clean-css": "^5.2.2",
-        "commander": "^8.3.0",
-        "he": "^1.2.0",
-        "param-case": "^3.0.4",
-        "relateurl": "^0.2.7",
-        "terser": "^5.10.0"
-      },
-      "bin": {
-        "html-minifier-terser": "cli.js"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/html-minifier-terser/node_modules/commander": {
-      "version": "8.3.0",
-      "resolved": "https://registry.npmjs.org/commander/-/commander-8.3.0.tgz",
-      "integrity": "sha512-OkTL9umf+He2DZkUq8f8J9of7yL6RJKI24dVITBmNfZBmri9zYZQrKkuXiKhyfPSu8tUhnVBB1iKXevvnlR4Ww==",
-      "engines": {
-        "node": ">= 12"
-      }
-    },
-    "node_modules/html-webpack-plugin": {
-      "version": "5.6.3",
-      "resolved": "https://registry.npmjs.org/html-webpack-plugin/-/html-webpack-plugin-5.6.3.tgz",
-      "integrity": "sha512-QSf1yjtSAsmf7rYBV7XX86uua4W/vkhIt0xNXKbsi2foEeW7vjJQz4bhnpL3xH+l1ryl1680uNv968Z+X6jSYg==",
-      "dependencies": {
-        "@types/html-minifier-terser": "^6.0.0",
-        "html-minifier-terser": "^6.0.2",
-        "lodash": "^4.17.21",
-        "pretty-error": "^4.0.0",
-        "tapable": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/html-webpack-plugin"
-      },
-      "peerDependencies": {
-        "@rspack/core": "0.x || 1.x",
-        "webpack": "^5.20.0"
-      },
-      "peerDependenciesMeta": {
-        "@rspack/core": {
-          "optional": true
-        },
-        "webpack": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/htmlparser2": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/htmlparser2/-/htmlparser2-6.1.0.tgz",
-      "integrity": "sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==",
-      "funding": [
-        "https://github.com/fb55/htmlparser2?sponsor=1",
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/fb55"
-        }
-      ],
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.0.0",
-        "domutils": "^2.5.2",
-        "entities": "^2.0.0"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/htmlparser2/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/http-deceiver": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/http-deceiver/-/http-deceiver-1.2.7.tgz",
-      "integrity": "sha512-LmpOGxTfbpgtGVxJrj5k7asXHCgNZp5nLfp+hWc8QQRqtb7fUy6kRY3BO1h9ddF6yIPYUARgxGOwB42DnxIaNw=="
-    },
-    "node_modules/http-errors": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-2.0.0.tgz",
-      "integrity": "sha512-FtwrG/euBzaEjYeRqOgly7G0qviiXoJWnvEH2Z1plBdXgbyjv34pHTSb9zoeHMyDy33+DWy5Wt9Wo+TURtOYSQ==",
-      "dependencies": {
-        "depd": "2.0.0",
-        "inherits": "2.0.4",
-        "setprototypeof": "1.2.0",
-        "statuses": "2.0.1",
-        "toidentifier": "1.0.1"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-errors/node_modules/statuses": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/statuses/-/statuses-2.0.1.tgz",
-      "integrity": "sha512-RwNA9Z/7PrK06rYLIzFMlaF+l73iwpzsqRIFgbMLbTcLD6cOao82TaWefPXQvB2fOC4AjuYSEndS7N/mTCbkdQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/http-parser-js": {
-      "version": "0.5.10",
-      "resolved": "https://registry.npmjs.org/http-parser-js/-/http-parser-js-0.5.10.tgz",
-      "integrity": "sha512-Pysuw9XpUq5dVc/2SMHpuTY01RFl8fttgcyunjL7eEMhGM3cI4eOmiCycJDVCo/7O7ClfQD3SaI6ftDzqOXYMA=="
-    },
-    "node_modules/http-proxy": {
-      "version": "1.18.1",
-      "resolved": "https://registry.npmjs.org/http-proxy/-/http-proxy-1.18.1.tgz",
-      "integrity": "sha512-7mz/721AbnJwIVbnaSv1Cz3Am0ZLT/UBwkC92VlxhXv/k/BBQfM2fXElQNC27BVGr0uwUpplYPQM9LnaBMR5NQ==",
-      "dependencies": {
-        "eventemitter3": "^4.0.0",
-        "follow-redirects": "^1.0.0",
-        "requires-port": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/http-proxy-agent": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/http-proxy-agent/-/http-proxy-agent-5.0.0.tgz",
-      "integrity": "sha512-n2hY8YdoRE1i7r6M0w9DIw5GgZN0G25P8zLCRQ8rjXtTU3vsNFBI/vWK/UIeE6g5MUUz6avwAPXmL6Fy9D/90w==",
-      "dependencies": {
-        "@tootallnate/once": "2",
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/http-proxy-middleware": {
-      "version": "2.0.9",
-      "resolved": "https://registry.npmjs.org/http-proxy-middleware/-/http-proxy-middleware-2.0.9.tgz",
-      "integrity": "sha512-c1IyJYLYppU574+YI7R4QyX2ystMtVXZwIdzazUIPIJsHuWNd+mho2j+bKoHftndicGj9yh+xjd+l0yj7VeT1Q==",
-      "dependencies": {
-        "@types/http-proxy": "^1.17.8",
-        "http-proxy": "^1.18.1",
-        "is-glob": "^4.0.1",
-        "is-plain-obj": "^3.0.0",
-        "micromatch": "^4.0.2"
-      },
-      "engines": {
-        "node": ">=12.0.0"
-      },
-      "peerDependencies": {
-        "@types/express": "^4.17.13"
-      },
-      "peerDependenciesMeta": {
-        "@types/express": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/https-browserify": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-0.0.1.tgz",
-      "integrity": "sha512-EjDQFbgJr1vDD/175UJeSX3ncQ3+RUnCL5NkthQGHvF4VNHlzTy8ifJfTqz47qiPRqaFH58+CbuG3x51WuB1XQ=="
-    },
-    "node_modules/https-proxy-agent": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-5.0.1.tgz",
-      "integrity": "sha512-dFcAjpTQFgoLMzC2VwU+C/CbS7uRL0lWmxDITmqm7C+7F0Odmj6s9l6alZc6AELXhrnggM2CeWSXHGOdX2YtwA==",
-      "dependencies": {
-        "agent-base": "6",
-        "debug": "4"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/human-signals": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/human-signals/-/human-signals-2.1.0.tgz",
-      "integrity": "sha512-B4FFZ6q/T2jhhksgkbEW3HBvWIfDW85snkQgawt07S7J5QXTk6BkNV+0yAeZrM5QpMAdYlocGoljn0sJ/WQkFw==",
-      "engines": {
-        "node": ">=10.17.0"
-      }
-    },
-    "node_modules/husky": {
-      "version": "9.1.7",
-      "resolved": "https://registry.npmjs.org/husky/-/husky-9.1.7.tgz",
-      "integrity": "sha512-5gs5ytaNjBrh5Ow3zrvdUUY+0VxIuWVL4i9irt6friV+BqdCfmV11CQTWMiBYWHbXhco+J1kHfTOUkePhCDvMA==",
-      "dev": true,
-      "bin": {
-        "husky": "bin.js"
-      },
-      "engines": {
-        "node": ">=18"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/typicode"
-      }
-    },
-    "node_modules/hyphenate-style-name": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/hyphenate-style-name/-/hyphenate-style-name-1.1.0.tgz",
-      "integrity": "sha512-WDC/ui2VVRrz3jOVi+XtjqkDjiVjTtFaAGiW37k6b+ohyQ5wYDOGkvCZa8+H0nx3gyvv0+BST9xuOgIyGQ00gw=="
-    },
-    "node_modules/iconv-lite": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz",
-      "integrity": "sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/icss-utils": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/icss-utils/-/icss-utils-5.1.0.tgz",
-      "integrity": "sha512-soFhflCVWLfRNOPU3iv5Z9VUdT44xFRbzjLsEzSr5AQmgqPMTHdU3PMT1Cf1ssx8fLNJDA1juftYl+PUcv3MqA==",
-      "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
-      }
-    },
-    "node_modules/ieee754": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/ieee754/-/ieee754-1.2.1.tgz",
-      "integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/feross"
-        },
-        {
-          "type": "patreon",
-          "url": "https://www.patreon.com/feross"
-        },
-        {
-          "type": "consulting",
-          "url": "https://feross.org/support"
-        }
-      ]
-    },
-    "node_modules/ignore": {
-      "version": "5.3.2",
-      "resolved": "https://registry.npmjs.org/ignore/-/ignore-5.3.2.tgz",
-      "integrity": "sha512-hsBTNUqQTDwkWtcdYI2i06Y/nUBEsNEDJKjWdigLvegy8kDuJAS8uRlpkkcQpyEXL0Z/pjDy5HBmMjRCJ2gq+g==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
-    "node_modules/image-size": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/image-size/-/image-size-1.2.0.tgz",
-      "integrity": "sha512-4S8fwbO6w3GeCVN6OPtA9I5IGKkcDMPcKndtUlpJuCwu7JLjtj7JZpwqLuyY2nrmQT3AWsCJLSKPsc2mPBSl3w==",
-      "dependencies": {
-        "queue": "6.0.2"
-      },
-      "bin": {
-        "image-size": "bin/image-size.js"
-      },
-      "engines": {
-        "node": ">=16.x"
-      }
-    },
-    "node_modules/immer": {
-      "version": "10.1.1",
-      "resolved": "https://registry.npmjs.org/immer/-/immer-10.1.1.tgz",
-      "integrity": "sha512-s2MPrmjovJcoMaHtx6K11Ra7oD05NT97w1IC5zpMkT6Atjr7H8LjaDd81iIxUYpMKSRRNMJE703M1Fhr/TctHw==",
-      "license": "MIT",
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/immer"
-      }
-    },
-    "node_modules/import-fresh": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/import-fresh/-/import-fresh-2.0.0.tgz",
-      "integrity": "sha512-eZ5H8rcgYazHbKC3PG4ClHNykCSxtAhxSSEM+2mb+7evD2CKF5V7c0dNum7AdpDh0ZdICwZY9sRSn8f+KH96sg==",
-      "dependencies": {
-        "caller-path": "^2.0.0",
-        "resolve-from": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-fresh/node_modules/resolve-from": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-3.0.0.tgz",
-      "integrity": "sha512-GnlH6vxLymXJNMBo7XP1fJIzBFbdYt49CuTwmB/6N53t+kMPRMFKz783LlQ4tv28XoQfMWinAJX6WCGf2IlaIw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/import-local": {
-      "version": "3.2.0",
-      "resolved": "https://registry.npmjs.org/import-local/-/import-local-3.2.0.tgz",
-      "integrity": "sha512-2SPlun1JUPWoM6t3F0dw0FkCF/jWY8kttcY4f599GLTSjh2OCuuhdTkJQsEcZzBqbXZGKMK2OqW1oZsjtf/gQA==",
-      "dependencies": {
-        "pkg-dir": "^4.2.0",
-        "resolve-cwd": "^3.0.0"
-      },
-      "bin": {
-        "import-local-fixture": "fixtures/cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/find-up": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-4.1.0.tgz",
-      "integrity": "sha512-PpOwAdQ/YlXQ2vj8a3h8IipDuYRi3wceVQQGYWxNINccq40Anw7BlsEXCMbt1Zt+OLA6Fq9suIpIWD0OsnISlw==",
-      "dependencies": {
-        "locate-path": "^5.0.0",
-        "path-exists": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/locate-path": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-5.0.0.tgz",
-      "integrity": "sha512-t7hw9pI+WvuwNJXwk5zVHpyhIqzg2qTlklJOf0mVxGSbe3Fp2VieZcduNYjaLDoy6p9uGpQEGWG87WpMKlNq8g==",
-      "dependencies": {
-        "p-locate": "^4.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "dependencies": {
-        "p-try": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/import-local/node_modules/p-locate": {
-      "version": "4.1.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-4.1.0.tgz",
-      "integrity": "sha512-R79ZZ/0wAxKGu3oYMlz8jy/kbhsNrS7SKZ7PxEHBgJ5+F2mtFW2fK2cOtBh1cHYkQsbzFV7I+EoRKe6Yt0oK7A==",
-      "dependencies": {
-        "p-limit": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/import-local/node_modules/pkg-dir": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-4.2.0.tgz",
-      "integrity": "sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==",
-      "dependencies": {
-        "find-up": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/imurmurhash": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/imurmurhash/-/imurmurhash-0.1.4.tgz",
-      "integrity": "sha512-JmXMZ6wuvDmLiHEml9ykzqO6lwFbof0GG4IkcGaENdCRDDmMVnny7s5HsIgHCbaq0w2MyPhDqkhTUgS2LU2PHA==",
-      "engines": {
-        "node": ">=0.8.19"
-      }
-    },
-    "node_modules/indent-string": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-4.0.0.tgz",
-      "integrity": "sha512-EdDDZu4A2OyIK7Lr/2zG+w5jmbuk1DVBnEwREQvBzspBJkCEbRa8GxU1lghYcaGJCnRWibjDXlq779X1/y5xwg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/indexof": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/indexof/-/indexof-0.0.1.tgz",
-      "integrity": "sha512-i0G7hLJ1z0DE8dsqJa2rycj9dBmNKgXBvotXtZYXakU9oivfB9Uj2ZBC27qqef2U58/ZLwalxa1X/RDCdkHtVg=="
-    },
-    "node_modules/infer-owner": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/infer-owner/-/infer-owner-1.0.4.tgz",
-      "integrity": "sha512-IClj+Xz94+d7irH5qRyfJonOdfTzuDaifE6ZPWfx0N0+/ATZCbuTPq2prFl526urkQd90WyUKIh1DfBQ2hMz9A==",
-      "peer": true
-    },
-    "node_modules/inflight": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
-      "integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
-      "deprecated": "This module is not supported, and leaks memory. Do not use it. Check out lru-cache if you want a good and tested way to coalesce async requests by a key value, which is much more comprehensive and powerful.",
-      "dependencies": {
-        "once": "^1.3.0",
-        "wrappy": "1"
-      }
-    },
-    "node_modules/inherits": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
-    },
-    "node_modules/ini": {
-      "version": "1.3.8",
-      "resolved": "https://registry.npmjs.org/ini/-/ini-1.3.8.tgz",
-      "integrity": "sha512-JV/yugV2uzW5iMRSiZAyDtQd+nxtUnjeLt0acNdw98kKLrvuRVyB80tsREOE7yvGVgalhZ6RNXCmEHkUKBKxew=="
-    },
-    "node_modules/inline-style-prefixer": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/inline-style-prefixer/-/inline-style-prefixer-6.0.4.tgz",
-      "integrity": "sha512-FwXmZC2zbeeS7NzGjJ6pAiqRhXR0ugUShSNb6GApMl6da0/XGc4MOJsoWAywia52EEWbXNSy0pzkwz/+Y+swSg==",
-      "dependencies": {
-        "css-in-js-utils": "^3.1.0",
-        "fast-loops": "^1.1.3"
-      }
-    },
-    "node_modules/internal-ip": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/internal-ip/-/internal-ip-4.3.0.tgz",
-      "integrity": "sha512-S1zBo1D6zcsyuC6PMmY5+55YMILQ9av8lotMx447Bq6SAgo/sDK6y6uUKmuYhW7eacnIhFfsPmCNYdDzsnnDCg==",
-      "dependencies": {
-        "default-gateway": "^4.2.0",
-        "ipaddr.js": "^1.9.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/internal-slot": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/internal-slot/-/internal-slot-1.1.0.tgz",
-      "integrity": "sha512-4gd7VpWNQNB4UKKCFFVcp1AVv+FMOgs9NKzjHKusc8jTMhd5eL1NqQqOpE0KzMds804/yHlglp3uxgluOqAPLw==",
-      "dependencies": {
-        "es-errors": "^1.3.0",
-        "hasown": "^2.0.2",
-        "side-channel": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/invariant": {
-      "version": "2.2.4",
-      "resolved": "https://registry.npmjs.org/invariant/-/invariant-2.2.4.tgz",
-      "integrity": "sha512-phJfQVBuaJM5raOpJjSfkiD6BpbCE4Ns//LaXl6wGYtUBY83nWS6Rf9tXm2e8VaK60JEjYldbPif/A2B1C2gNA==",
-      "dependencies": {
-        "loose-envify": "^1.0.0"
-      }
-    },
-    "node_modules/ip-regex": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-2.1.0.tgz",
-      "integrity": "sha512-58yWmlHpp7VYfcdTwMTvwMmqx/Elfxjd9RXTDyMsbL7lLWmhMylLEqiYVLKuLzOZqVgiWXD9MfR62Vv89VRxkw==",
-      "engines": {
-        "node": ">=4"
-      }
-    },
-    "node_modules/ipaddr.js": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-1.9.1.tgz",
-      "integrity": "sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
-    "node_modules/is": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/is/-/is-0.2.7.tgz",
-      "integrity": "sha512-ajQCouIvkcSnl2iRdK70Jug9mohIHVX9uKpoWnl115ov0R5mzBvRrXxrnHbsA+8AdwCwc/sfw7HXmd4I5EJBdQ==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/is-array-buffer": {
-      "version": "3.0.5",
-      "resolved": "https://registry.npmjs.org/is-array-buffer/-/is-array-buffer-3.0.5.tgz",
-      "integrity": "sha512-DDfANUiiG2wC1qawP66qlTugJeL5HyzMpfr8lLK+jMQirGzNod0B12cFB/9q838Ru27sBwfw78/rdoU7RERz6A==",
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-arrayish": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/is-arrayish/-/is-arrayish-0.2.1.tgz",
-      "integrity": "sha512-zz06S8t0ozoDXMG+ube26zeCTNXcKIPJZJi8hBrF4idCLms4CG9QtK7qBl1boi5ODzFpjswb5JPmHCbMpjaYzg=="
-    },
-    "node_modules/is-async-function": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-async-function/-/is-async-function-2.1.1.tgz",
-      "integrity": "sha512-9dgM/cZBnNvjzaMYHVoxxfPj2QXt22Ev7SuuPrs+xav0ukGB0S6d4ydZdEiM48kLx5kDV+QBPrpVnFyefL8kkQ==",
-      "dependencies": {
-        "async-function": "^1.0.0",
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.1",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-bigint": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-bigint/-/is-bigint-1.1.0.tgz",
-      "integrity": "sha512-n4ZT37wG78iz03xPRKJrHTdZbe3IicyucEtdRsV5yglwc3GyUfbAfpSeD0FJ41NbUNSt5wbhqfp1fS+BgnvDFQ==",
-      "dependencies": {
-        "has-bigints": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-binary-path": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-binary-path/-/is-binary-path-2.1.0.tgz",
-      "integrity": "sha512-ZMERYes6pDydyuGidse7OsHxtbI7WVeUEozgR/g7rd0xUimYNlvZRE/K2MgZTjWy725IfelLeVcEM97mmtRGXw==",
-      "dependencies": {
-        "binary-extensions": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-boolean-object": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/is-boolean-object/-/is-boolean-object-1.2.2.tgz",
-      "integrity": "sha512-wa56o2/ElJMYqjCjGkXri7it5FbebW5usLw/nPmCMs5DeZ7eziSYZhSmPRn0txqeW4LnAmQQU7FgqLpsEFKM4A==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-buffer": {
-      "version": "1.1.6",
-      "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz",
-      "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w=="
-    },
-    "node_modules/is-bun-module": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/is-bun-module/-/is-bun-module-1.3.0.tgz",
-      "integrity": "sha512-DgXeu5UWI0IsMQundYb5UAOzm6G2eVnarJ0byP6Tm55iZNKceD59LNPA2L4VvsScTtHcw0yEkVwSf7PC+QoLSA==",
-      "dev": true,
-      "dependencies": {
-        "semver": "^7.6.3"
-      }
-    },
-    "node_modules/is-bun-module/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "dev": true,
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/is-callable": {
-      "version": "1.2.7",
-      "resolved": "https://registry.npmjs.org/is-callable/-/is-callable-1.2.7.tgz",
-      "integrity": "sha512-1BC0BVFhS/p0qtw6enp8e+8OD0UrK0oFLztSjNzhcKA3WDuJxxAPXzPuPtKkjEY9UUoEWlX/8fgKeu2S8i9JTA==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-core-module": {
-      "version": "2.16.1",
-      "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.16.1.tgz",
-      "integrity": "sha512-UfoeMA6fIJ8wTYFEUjelnaGI67v6+N7qXJEvQuIGa99l4xsCruSYOVSQ0uPANn4dAzm8lkYPaKLrrijLq7x23w==",
-      "dependencies": {
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-data-view": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-data-view/-/is-data-view-1.0.2.tgz",
-      "integrity": "sha512-RKtWF8pGmS87i2D6gqQu/l7EYRlVdfzemCJN/P3UOs//x1QE7mfhvzHIApBTRf7axvT6DMGwSwBXYCT0nfB9xw==",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "get-intrinsic": "^1.2.6",
-        "is-typed-array": "^1.1.13"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-date-object": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-date-object/-/is-date-object-1.1.0.tgz",
-      "integrity": "sha512-PwwhEakHVKTdRNVOw+/Gyh0+MzlCl4R6qKvkhuvLtPMggI1WAHt9sOwZxQLSGpUaDnrdyDsomoRgNnCfKNSXXg==",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-directory": {
-      "version": "0.3.1",
-      "resolved": "https://registry.npmjs.org/is-directory/-/is-directory-0.3.1.tgz",
-      "integrity": "sha512-yVChGzahRFvbkscn2MlwGismPO12i9+znNruC5gVEntG3qu0xQMzsGg/JFbrsqDOHtHFPci+V5aP5T9I+yeKqw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-docker": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/is-docker/-/is-docker-2.2.1.tgz",
-      "integrity": "sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==",
-      "bin": {
-        "is-docker": "cli.js"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-extglob": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-2.1.1.tgz",
-      "integrity": "sha512-SbKbANkN603Vi4jEZv49LeVJMn4yGwsbzZworEoyEiutsN3nJYdbO36zfhGJ6QEDpOZIFkDtnq5JRxmvl3jsoQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-finalizationregistry": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-finalizationregistry/-/is-finalizationregistry-1.1.1.tgz",
-      "integrity": "sha512-1pC6N8qWJbWoPtEjgcL2xyhQOP491EQjeUo3qTKcmV8YSDDJrOepfG8pcC7h/QgnQHYSv0mJ3Z/ZWxmatVrysg==",
-      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-fullwidth-code-point": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-3.0.0.tgz",
-      "integrity": "sha512-zymm5+u+sCsSWyD9qNaejV3DFvhCKclKdizYaJUuHA83RLjb7nSuGnddCHGv0hk+KY7BMAlsWeK4Ueg6EV6XQg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-generator-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-fn/-/is-generator-fn-2.1.0.tgz",
-      "integrity": "sha512-cTIB4yPYL/Grw0EaSzASzg6bBy9gqCofvWN8okThAYIxKJZC+udlRAmGbM0XLeniEJSs8uEgHPGuHSe1XsOLSQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-generator-function": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-generator-function/-/is-generator-function-1.1.0.tgz",
-      "integrity": "sha512-nPUB5km40q9e8UfN/Zc24eLlzdSf9OfKByBw9CIdw4H1giPMeA0OIJvbchsCu4npfI2QcMVBsGEBHKZ7wLTWmQ==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-proto": "^1.0.0",
-        "has-tostringtag": "^1.0.2",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-glob": {
-      "version": "4.0.3",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-4.0.3.tgz",
-      "integrity": "sha512-xelSayHH36ZgE7ZWhli7pW34hNbNl8Ojv5KVmkJD4hBdD3th8Tfk9vYasLM+mXWOZhFkgZfxhLSnrwRr4elSSg==",
-      "dependencies": {
-        "is-extglob": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-invalid-path": {
-      "version": "0.1.0",
-      "resolved": "https://registry.npmjs.org/is-invalid-path/-/is-invalid-path-0.1.0.tgz",
-      "integrity": "sha512-aZMG0T3F34mTg4eTdszcGXx54oiZ4NtHSft3hWNJMGJXUUqdIj3cOZuHcU0nCWWcY3jd7yRe/3AEm3vSNTpBGQ==",
-      "peer": true,
-      "dependencies": {
-        "is-glob": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-invalid-path/node_modules/is-extglob": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-extglob/-/is-extglob-1.0.0.tgz",
-      "integrity": "sha512-7Q+VbVafe6x2T+Tu6NcOf6sRklazEPmBoB3IWk3WdGZM2iGUwU/Oe3Wtq5lSEkDTTlpp8yx+5t4pzO/i9Ty1ww==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-invalid-path/node_modules/is-glob": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-glob/-/is-glob-2.0.1.tgz",
-      "integrity": "sha512-a1dBeB19NXsf/E0+FHqkagizel/LQw2DjSQpvQrj3zT+jYPpaUCryPnrQajXKFLCMuf4I6FhRpaGtw4lPrG6Eg==",
-      "peer": true,
-      "dependencies": {
-        "is-extglob": "^1.0.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-map": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-map/-/is-map-2.0.3.tgz",
-      "integrity": "sha512-1Qed0/Hr2m+YqxnM09CjA2d/i6YZNfF6R2oRAOj36eUdS6qIV/huPJNSEpKbupewFs+ZsJlxsjjPbc0/afW6Lw==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-number": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/is-number/-/is-number-7.0.0.tgz",
-      "integrity": "sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==",
-      "engines": {
-        "node": ">=0.12.0"
-      }
-    },
-    "node_modules/is-number-object": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-number-object/-/is-number-object-1.1.1.tgz",
-      "integrity": "sha512-lZhclumE1G6VYD8VHe35wFaIif+CTy5SJIi5+3y4psDgWu4wPDoBhF8NxUOinEc7pHgiTsT6MaBb92rKhhD+Xw==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-object": {
-      "version": "0.1.2",
-      "resolved": "https://registry.npmjs.org/is-object/-/is-object-0.1.2.tgz",
-      "integrity": "sha512-GkfZZlIZtpkFrqyAXPQSRBMsaHAw+CgoKe2HXAkjd/sfoI9+hS8PT4wg2rJxdQyUKr7N2vHJbg7/jQtE5l5vBQ=="
-    },
-    "node_modules/is-path-cwd": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.2.0.tgz",
-      "integrity": "sha512-w942bTcih8fdJPJmQHFzkS76NEP8Kzzvmw92cXsazb8intwLqPibPPdXf4ANdKV3rYMuuQYGIWtvz9JilB3NFQ==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
-      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
-      "dependencies": {
-        "is-path-inside": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-in-cwd/node_modules/is-path-inside": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
-      "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
-      "dependencies": {
-        "path-is-inside": "^1.0.2"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-path-inside": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-3.0.3.tgz",
-      "integrity": "sha512-Fd4gABb+ycGAmKou8eMftCupSir5lRxqf4aD/vd0cD2qc4HL07OjCeuHMr8Ro4CoMaeCKDB0/ECBOVWjTwUvPQ==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/is-plain-obj": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/is-plain-obj/-/is-plain-obj-3.0.0.tgz",
-      "integrity": "sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/is-plain-object": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-plain-object/-/is-plain-object-2.0.4.tgz",
-      "integrity": "sha512-h5PpgXkWitc38BBMYawTYMWJHFZJVnBquFE57xFpjB8pJFiF6gZ+bU+WyI/yqXiFR5mdLsgYNaPe8uao6Uv9Og==",
-      "dependencies": {
-        "isobject": "^3.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-potential-custom-element-name": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-potential-custom-element-name/-/is-potential-custom-element-name-1.0.1.tgz",
-      "integrity": "sha512-bCYeRA2rVibKZd+s2625gGnGF/t7DSqDs4dP7CrLA1m7jKWz6pps0LpYLJN8Q64HtmPKJ1hrN3nzPNKFEKOUiQ=="
-    },
-    "node_modules/is-regex": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/is-regex/-/is-regex-1.2.1.tgz",
-      "integrity": "sha512-MjYsKHO5O7mCsmRGxWcLWheFqN9DJ/2TmngvjKXihe6efViPqc274+Fx/4fYj/r03+ESvBdTXK0V6tA3rgez1g==",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "gopd": "^1.2.0",
-        "has-tostringtag": "^1.0.2",
-        "hasown": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-root": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/is-root/-/is-root-2.1.0.tgz",
-      "integrity": "sha512-AGOriNp96vNBd3HtU+RzFEc75FfR5ymiYv8E553I71SCeXBiMsVDUtdio1OEFvrPyLIQ9tVR5RxXIFe5PUFjMg==",
-      "peer": true,
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/is-set": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/is-set/-/is-set-2.0.3.tgz",
-      "integrity": "sha512-iPAjerrse27/ygGLxw+EBR9agv9Y6uLeYVJMu+QNCoouJ1/1ri0mGrcWpfCqFZuzzx3WjtwxG098X+n4OuRkPg==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-shared-array-buffer": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/is-shared-array-buffer/-/is-shared-array-buffer-1.0.4.tgz",
-      "integrity": "sha512-ISWac8drv4ZGfwKl5slpHG9OwPNty4jOWPRIhBpxOoD+hqITiwuipOQ2bNthAzwA3B4fIjO4Nln74N0S9byq8A==",
-      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-stream": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-1.1.0.tgz",
-      "integrity": "sha512-uQPm8kcs47jx38atAcWTVxyltQYoPT68y9aWYdV6yWXSyW8mzSat0TL6CiWdZeCdF3KrAvpVtnHbTv4RN+rqdQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-string": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-string/-/is-string-1.1.1.tgz",
-      "integrity": "sha512-BtEeSsoaQjlSPBemMQIrY1MY0uM6vnS1g5fmufYOtnxLGUZM2178PKbhsk7Ffv58IX+ZtcvoGwccYsh0PglkAA==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "has-tostringtag": "^1.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-symbol": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-symbol/-/is-symbol-1.1.1.tgz",
-      "integrity": "sha512-9gGx6GTtCQM73BgmHQXfDmLtfjjTUDSyoxTCbp5WtoixAhfgsDirWIcVQ/IHpvI5Vgd5i/J5F7B9cN/WlVbC/w==",
-      "dependencies": {
-        "call-bound": "^1.0.2",
-        "has-symbols": "^1.1.0",
-        "safe-regex-test": "^1.1.0"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-typed-array": {
-      "version": "1.1.15",
-      "resolved": "https://registry.npmjs.org/is-typed-array/-/is-typed-array-1.1.15.tgz",
-      "integrity": "sha512-p3EcsicXjit7SaskXHs1hA91QxgTw46Fv6EFKKGS5DRFLD8yKnohjF3hxoju94b/OcMZoQukzpPpBE9uLVKzgQ==",
-      "dependencies": {
-        "which-typed-array": "^1.1.16"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-valid-path": {
-      "version": "0.1.1",
-      "resolved": "https://registry.npmjs.org/is-valid-path/-/is-valid-path-0.1.1.tgz",
-      "integrity": "sha512-+kwPrVDu9Ms03L90Qaml+79+6DZHqHyRoANI6IsZJ/g8frhnfchDOBCa0RbQ6/kdHt5CS5OeIEyrYznNuVN+8A==",
-      "peer": true,
-      "dependencies": {
-        "is-invalid-path": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/is-weakmap": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/is-weakmap/-/is-weakmap-2.0.2.tgz",
-      "integrity": "sha512-K5pXYOm9wqY1RgjpL3YTkF39tni1XajUIkawTLUo9EZEVUFga5gSQJF8nNS7ZwJQ02y+1YCNYcMh+HIf1ZqE+w==",
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakref": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/is-weakref/-/is-weakref-1.1.1.tgz",
-      "integrity": "sha512-6i9mGWSlqzNMEqpCp93KwRS1uUOodk2OJ6b+sq7ZPDSy2WuI5NFIxp/254TytR8ftefexkWn5xNiHUNpPOfSew==",
-      "dependencies": {
-        "call-bound": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-weakset": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/is-weakset/-/is-weakset-2.0.4.tgz",
-      "integrity": "sha512-mfcwb6IzQyOKTs84CQMrOwW4gQcaTOAWJ0zzJCl2WSPDrWk/OzDaImWFH3djXhb24g4eudZfLRozAvPGw4d9hQ==",
-      "dependencies": {
-        "call-bound": "^1.0.3",
-        "get-intrinsic": "^1.2.6"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
-    "node_modules/is-wsl": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/is-wsl/-/is-wsl-2.2.0.tgz",
-      "integrity": "sha512-fKzAra0rGJUUBwGBgNkHZuToZcn+TtXHpeCgmkMJMMYx1sQDYaCSyjJBSCa2nH1DGm7s3n1oBnohoVTBaN7Lww==",
-      "dependencies": {
-        "is-docker": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/isarray": {
-      "version": "2.0.5",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-2.0.5.tgz",
-      "integrity": "sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw=="
-    },
-    "node_modules/isexe": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
-      "integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
-    },
-    "node_modules/isobject": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/isobject/-/isobject-3.0.1.tgz",
-      "integrity": "sha512-WhB9zCku7EGTj/HQQRz5aUQEUeoQZH2bWcltRErOpymJ4boYE6wL9Tbr23krRPSZ+C5zqNSrSw+Cc7sZZ4b7vg==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/isomorphic-fetch": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/isomorphic-fetch/-/isomorphic-fetch-3.0.0.tgz",
-      "integrity": "sha512-qvUtwJ3j6qwsF3jLxkZ72qCgjMysPzDfeV240JHiGZsANBYd+EEuu35v7dfrJ9Up0Ak07D7GGSkGhCHTqg/5wA==",
-      "dependencies": {
-        "node-fetch": "^2.6.1",
-        "whatwg-fetch": "^3.4.1"
-      }
-    },
-    "node_modules/istanbul-lib-coverage": {
-      "version": "3.2.2",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-coverage/-/istanbul-lib-coverage-3.2.2.tgz",
-      "integrity": "sha512-O8dpsF+r0WV/8MNRKfnmrtCWhuKjxrq2w+jpzBL5UZKTi2LeVWnWOmWRxFlesJONmc+wLAGvKQZEOanko0LFTg==",
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-instrument": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-instrument/-/istanbul-lib-instrument-5.2.1.tgz",
-      "integrity": "sha512-pzqtp31nLv/XFOzXGuvhCb8qhjmTVo5vjVk19XE4CRlSWz0KoeJ3bw9XsA7nOp9YBf4qHjwBxkDzKcME/J29Yg==",
-      "dependencies": {
-        "@babel/core": "^7.12.3",
-        "@babel/parser": "^7.14.7",
-        "@istanbuljs/schema": "^0.1.2",
-        "istanbul-lib-coverage": "^3.2.0",
-        "semver": "^6.3.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/istanbul-lib-report": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-report/-/istanbul-lib-report-3.0.1.tgz",
-      "integrity": "sha512-GCfE1mtsHGOELCU8e/Z7YWzpmybrx/+dSTfLrvY8qRmaY6zXTKWn6WQIjaAFw069icm6GVMNkgu0NzI4iPZUNw==",
-      "dependencies": {
-        "istanbul-lib-coverage": "^3.0.0",
-        "make-dir": "^4.0.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/make-dir": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-4.0.0.tgz",
-      "integrity": "sha512-hXdUTZYIVOt1Ex//jAQi+wTZZpUpwBj/0QsOzqegb3rGMMeJiSEu5xLHnYfBrRV4RH2+OCSOO95Is/7x1WJ4bw==",
-      "dependencies": {
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/istanbul-lib-report/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/istanbul-lib-source-maps/-/istanbul-lib-source-maps-4.0.1.tgz",
-      "integrity": "sha512-n3s8EwkdFIJCG3BPKBYvskgXGoy88ARzvegkitk60NxRdwltLOTaH7CUiMRXvwYorl0Q712iEjcWB+fK/MrWVw==",
-      "dependencies": {
-        "debug": "^4.1.1",
-        "istanbul-lib-coverage": "^3.0.0",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/istanbul-lib-source-maps/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/istanbul-reports": {
-      "version": "3.1.7",
-      "resolved": "https://registry.npmjs.org/istanbul-reports/-/istanbul-reports-3.1.7.tgz",
-      "integrity": "sha512-BewmUXImeuRk2YY0PVbxgKAysvhRPUQE0h5QRM++nVWyubKGV0l8qQ5op8+B2DOmwSe63Jivj0BjkPQVf8fP5g==",
-      "dependencies": {
-        "html-escaper": "^2.0.0",
-        "istanbul-lib-report": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/iterator.prototype": {
-      "version": "1.1.5",
-      "resolved": "https://registry.npmjs.org/iterator.prototype/-/iterator.prototype-1.1.5.tgz",
-      "integrity": "sha512-H0dkQoCa3b2VEeKQBOxFph+JAbcrQdE7KC0UkqwpLmv2EC4P41QXP+rqo9wYodACiG5/WM5s9oDApTU8utwj9g==",
-      "dev": true,
-      "dependencies": {
-        "define-data-property": "^1.1.4",
-        "es-object-atoms": "^1.0.0",
-        "get-intrinsic": "^1.2.6",
-        "get-proto": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "set-function-name": "^2.0.2"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/jackspeak": {
-      "version": "3.4.3",
-      "resolved": "https://registry.npmjs.org/jackspeak/-/jackspeak-3.4.3.tgz",
-      "integrity": "sha512-OGlZQpz2yfahA/Rd1Y8Cd9SIEsqvXkLVoSw/cgwhnhFMDbsQFeZYoJJ7bIZBS9BcamUW96asq/npPWugM+RQBw==",
-      "dependencies": {
-        "@isaacs/cliui": "^8.0.2"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      },
-      "optionalDependencies": {
-        "@pkgjs/parseargs": "^0.11.0"
-      }
-    },
-    "node_modules/jest": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest/-/jest-29.7.0.tgz",
-      "integrity": "sha512-NIy3oAFp9shda19hy4HK0HRTWKtPJmGdnvywu01nOqNC2vZg+Z+fvJDxpMQA88eb2I9EcafcdjYgsDthnYTvGw==",
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "import-local": "^3.0.2",
-        "jest-cli": "^29.7.0"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-changed-files": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-changed-files/-/jest-changed-files-29.7.0.tgz",
-      "integrity": "sha512-fEArFiwf1BpQ+4bXSprcDc3/x4HSzL4al2tozwVpDFpsxALjLYdyiIK4e5Vz66GQJIbXJ82+35PtysofptNX2w==",
-      "dependencies": {
-        "execa": "^5.0.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-changed-files/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/jest-circus": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-circus/-/jest-circus-29.7.0.tgz",
-      "integrity": "sha512-3E1nCMgipcTkCocFwM90XXQab9bS+GMsjdpmPrlelaxwD93Ad8iVEjX/vvHPdLPnFf+L40u+5+iutRdA1N9myw==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/expect": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "co": "^4.6.0",
-        "dedent": "^1.0.0",
-        "is-generator-fn": "^2.0.0",
-        "jest-each": "^29.7.0",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "pretty-format": "^29.7.0",
-        "pure-rand": "^6.0.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-cli": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-cli/-/jest-cli-29.7.0.tgz",
-      "integrity": "sha512-OVVobw2IubN/GSYsxETi+gOe7Ka59EFMR/twOU3Jb2GnKKeMGJB5SGUUrEz3SFVmJASUdZUzy83sLNNQ2gZslg==",
-      "dependencies": {
-        "@jest/core": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "create-jest": "^29.7.0",
-        "exit": "^0.1.2",
-        "import-local": "^3.0.2",
-        "jest-config": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "yargs": "^17.3.1"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "node-notifier": "^8.0.1 || ^9.0.0 || ^10.0.0"
-      },
-      "peerDependenciesMeta": {
-        "node-notifier": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-config/-/jest-config-29.7.0.tgz",
-      "integrity": "sha512-uXbpfeQ7R6TZBqI3/TxCU4q4ttk3u0PJeC+E0zbfSoSjq6bJ7buBPxzQPL0ifrkY4DNu4JUdk0ImlBUYi840eQ==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@jest/test-sequencer": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-jest": "^29.7.0",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "deepmerge": "^4.2.2",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-circus": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-runner": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "parse-json": "^5.2.0",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-json-comments": "^3.1.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "@types/node": "*",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "@types/node": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-config/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/jest-config/node_modules/parse-json": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-5.2.0.tgz",
-      "integrity": "sha512-ayCKvm/phCGxOkYRSCM82iDwct8/EonSEgCSxWxD7ve6jHggsFl4fZVQBPRNgQoKiuV/odhFrGzQXZwbifC8Rg==",
-      "dependencies": {
-        "@babel/code-frame": "^7.0.0",
-        "error-ex": "^1.3.1",
-        "json-parse-even-better-errors": "^2.3.0",
-        "lines-and-columns": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-config/node_modules/strip-json-comments": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/strip-json-comments/-/strip-json-comments-3.1.1.tgz",
-      "integrity": "sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-diff": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-diff/-/jest-diff-29.7.0.tgz",
-      "integrity": "sha512-LMIgiIrhigmPrs03JHpxUh2yISK3vLFPkAodPeo0+BuF7wA2FoQbkEg1u8gBYBThncu7e1oEDUfIXVuTqLRUjw==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "diff-sequences": "^29.6.3",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-docblock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-docblock/-/jest-docblock-29.7.0.tgz",
-      "integrity": "sha512-q617Auw3A612guyaFgsbFeYpNP5t2aoUNLwBUbc/0kD1R4t9ixDbyFTHd1nok4epoVFpr7PmeWHrhvuV3XaJ4g==",
-      "dependencies": {
-        "detect-newline": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-each": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-each/-/jest-each-29.7.0.tgz",
-      "integrity": "sha512-gns+Er14+ZrEoC5fhOfYCY1LOHHr0TI+rQUHZS8Ttw2l7gl+80eHc/gFf2Ktkw0+SIACDTeWvpFcv3B04VembQ==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-environment-jsdom": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-jsdom/-/jest-environment-jsdom-29.7.0.tgz",
-      "integrity": "sha512-k9iQbsf9OyOfdzWH8HDmrRT0gSIcX+FLNW7IQq94tFX0gynPwqDTW0Ho6iMVNjGz/nb+l/vW3dWM2bbLLpkbXA==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/jsdom": "^20.0.0",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jsdom": "^20.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-environment-node": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-environment-node/-/jest-environment-node-29.7.0.tgz",
-      "integrity": "sha512-DOSwCRqXirTOyheM+4d5YZOrWcdu0LNZ87ewUoywbcb2XR4wKgqiG8vNeYwhjFMbEkfju7wx2GYH0P2gevGvFw==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-mock": "^29.7.0",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-expo": {
-      "version": "52.0.5",
-      "resolved": "https://registry.npmjs.org/jest-expo/-/jest-expo-52.0.5.tgz",
-      "integrity": "sha512-2jjdE81tWxH5PPe5SGR9rxLZbPtuM7ihEL+43xlJIjgxcplsMpFV9Nb8r5h3IpG+aVDjMiQXqF25n9dqqD09OQ==",
-      "dependencies": {
-        "@expo/config": "~10.0.10",
-        "@expo/json-file": "^9.0.2",
-        "@jest/create-cache-key-function": "^29.2.1",
-        "@jest/globals": "^29.2.1",
-        "babel-jest": "^29.2.1",
-        "fbemitter": "^3.0.0",
-        "find-up": "^5.0.0",
-        "jest-environment-jsdom": "^29.2.1",
-        "jest-snapshot": "^29.2.1",
-        "jest-watch-select-projects": "^2.0.0",
-        "jest-watch-typeahead": "2.2.1",
-        "json5": "^2.2.3",
-        "lodash": "^4.17.19",
-        "react-server-dom-webpack": "19.0.0-rc-6230622a1a-20240610",
-        "react-test-renderer": "18.3.1",
-        "server-only": "^0.0.1",
-        "stacktrace-js": "^2.0.2"
-      },
-      "bin": {
-        "jest": "bin/jest.js"
-      },
-      "peerDependencies": {
-        "expo": "*",
-        "react-native": "*"
-      }
-    },
-    "node_modules/jest-expo/node_modules/react": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react/-/react-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-SMgWGY//7nO7F3HMuBfmC15Cr4vTe2tlpSCATfnz/wymSftDOKUqc+0smjRhcUeCFCc1zhOAWJ+N//U5CrmOzQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-expo/node_modules/react-dom": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react-dom/-/react-dom-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-56G4Pum5E7FeGL1rwHX5IxidSJxQnXP4yORRo0pVeOJuu5DQJvNKpUwmJoftMP/ez0AiglYTY77L2Gs8iyt1Hg==",
-      "peer": true,
-      "dependencies": {
-        "scheduler": "0.25.0-rc-6230622a1a-20240610"
-      },
-      "peerDependencies": {
-        "react": "19.0.0-rc-6230622a1a-20240610"
-      }
-    },
-    "node_modules/jest-expo/node_modules/react-server-dom-webpack": {
-      "version": "19.0.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/react-server-dom-webpack/-/react-server-dom-webpack-19.0.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-nr+IsOVD07QdeCr4BLvR5TALfLaZLi9AIaoa6vXymBc051iDPWedJujYYrjRJy5+9jp9oCx3G8Tt/Bs//TckJw==",
-      "dependencies": {
-        "acorn-loose": "^8.3.0",
-        "neo-async": "^2.6.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      },
-      "peerDependencies": {
-        "react": "19.0.0-rc-6230622a1a-20240610",
-        "react-dom": "19.0.0-rc-6230622a1a-20240610",
-        "webpack": "^5.59.0"
-      }
-    },
-    "node_modules/jest-expo/node_modules/scheduler": {
-      "version": "0.25.0-rc-6230622a1a-20240610",
-      "resolved": "https://registry.npmjs.org/scheduler/-/scheduler-0.25.0-rc-6230622a1a-20240610.tgz",
-      "integrity": "sha512-GTIQdJXthps5mgkIFo7yAq03M0QQYTfN8z+GrnMC/SCKFSuyFP5tk2BMaaWUsVy4u4r+dTLdiXH8JEivVls0Bw==",
-      "peer": true
-    },
-    "node_modules/jest-get-type": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-get-type/-/jest-get-type-29.6.3.tgz",
-      "integrity": "sha512-zrteXnqYxfQh7l5FHyL38jL39di8H8rHoecLH3JNxH3BwOrBsNeabdap5e0I23lD4HHI8W5VFBZqG4Eaq5LNcw==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-haste-map": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-haste-map/-/jest-haste-map-29.7.0.tgz",
-      "integrity": "sha512-fP8u2pyfqx0K1rGn1R9pyE0/KTn+G7PxktWidOBTqFPLYX0b9ksaMFkhK5vrS3DVun09pckLdlx90QthlW7AmA==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/graceful-fs": "^4.1.3",
-        "@types/node": "*",
-        "anymatch": "^3.0.3",
-        "fb-watchman": "^2.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-regex-util": "^29.6.3",
-        "jest-util": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "micromatch": "^4.0.4",
-        "walker": "^1.0.8"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      },
-      "optionalDependencies": {
-        "fsevents": "^2.3.2"
-      }
-    },
-    "node_modules/jest-leak-detector": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-leak-detector/-/jest-leak-detector-29.7.0.tgz",
-      "integrity": "sha512-kYA8IJcSYtST2BY9I+SMC32nDpBT3J2NvWJx8+JCuCdl/CR1I4EKUJROiP8XtCcxqgTTBGJNdbB1A8XRKbTetw==",
-      "dependencies": {
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-matcher-utils": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
-      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-message-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
-      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
-      "dependencies": {
-        "@babel/code-frame": "^7.12.13",
-        "@jest/types": "^29.6.3",
-        "@types/stack-utils": "^2.0.0",
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "micromatch": "^4.0.4",
-        "pretty-format": "^29.7.0",
-        "slash": "^3.0.0",
-        "stack-utils": "^2.0.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-mock": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
-      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "jest-util": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-pnp-resolver": {
-      "version": "1.2.3",
-      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
-      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
-      "engines": {
-        "node": ">=6"
-      },
-      "peerDependencies": {
-        "jest-resolve": "*"
-      },
-      "peerDependenciesMeta": {
-        "jest-resolve": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jest-regex-util": {
-      "version": "29.6.3",
-      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
-      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
-      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
-      "dependencies": {
-        "chalk": "^4.0.0",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-pnp-resolver": "^1.2.2",
-        "jest-util": "^29.7.0",
-        "jest-validate": "^29.7.0",
-        "resolve": "^1.20.0",
-        "resolve.exports": "^2.0.0",
-        "slash": "^3.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-resolve-dependencies": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
-      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
-      "dependencies": {
-        "jest-regex-util": "^29.6.3",
-        "jest-snapshot": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
-      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
-      "dependencies": {
-        "@jest/console": "^29.7.0",
-        "@jest/environment": "^29.7.0",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "graceful-fs": "^4.2.9",
-        "jest-docblock": "^29.7.0",
-        "jest-environment-node": "^29.7.0",
-        "jest-haste-map": "^29.7.0",
-        "jest-leak-detector": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-resolve": "^29.7.0",
-        "jest-runtime": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "jest-watcher": "^29.7.0",
-        "jest-worker": "^29.7.0",
-        "p-limit": "^3.1.0",
-        "source-map-support": "0.5.13"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/jest-runner/node_modules/source-map-support": {
-      "version": "0.5.13",
-      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
-      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
-      "dependencies": {
-        "buffer-from": "^1.0.0",
-        "source-map": "^0.6.0"
-      }
-    },
-    "node_modules/jest-runtime": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
-      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
-      "dependencies": {
-        "@jest/environment": "^29.7.0",
-        "@jest/fake-timers": "^29.7.0",
-        "@jest/globals": "^29.7.0",
-        "@jest/source-map": "^29.6.3",
-        "@jest/test-result": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "cjs-module-lexer": "^1.0.0",
-        "collect-v8-coverage": "^1.0.0",
-        "glob": "^7.1.3",
-        "graceful-fs": "^4.2.9",
-        "jest-haste-map": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-mock": "^29.7.0",
-        "jest-regex-util": "^29.6.3",
-        "jest-resolve": "^29.7.0",
-        "jest-snapshot": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "slash": "^3.0.0",
-        "strip-bom": "^4.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-runtime/node_modules/glob": {
-      "version": "7.2.3",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
-      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "dependencies": {
-        "fs.realpath": "^1.0.0",
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "^3.1.1",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
-      },
-      "engines": {
-        "node": "*"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/isaacs"
-      }
-    },
-    "node_modules/jest-snapshot": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
-      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
-      "dependencies": {
-        "@babel/core": "^7.11.6",
-        "@babel/generator": "^7.7.2",
-        "@babel/plugin-syntax-jsx": "^7.7.2",
-        "@babel/plugin-syntax-typescript": "^7.7.2",
-        "@babel/types": "^7.3.3",
-        "@jest/expect-utils": "^29.7.0",
-        "@jest/transform": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "babel-preset-current-node-syntax": "^1.0.0",
-        "chalk": "^4.0.0",
-        "expect": "^29.7.0",
-        "graceful-fs": "^4.2.9",
-        "jest-diff": "^29.7.0",
-        "jest-get-type": "^29.6.3",
-        "jest-matcher-utils": "^29.7.0",
-        "jest-message-util": "^29.7.0",
-        "jest-util": "^29.7.0",
-        "natural-compare": "^1.4.0",
-        "pretty-format": "^29.7.0",
-        "semver": "^7.5.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-snapshot/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
-      }
-    },
-    "node_modules/jest-util": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
-      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "chalk": "^4.0.0",
-        "ci-info": "^3.2.0",
-        "graceful-fs": "^4.2.9",
-        "picomatch": "^2.2.3"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-util/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
-      "engines": {
-        "node": ">=8.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
-      }
-    },
-    "node_modules/jest-validate": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
-      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
-      "dependencies": {
-        "@jest/types": "^29.6.3",
-        "camelcase": "^6.2.0",
-        "chalk": "^4.0.0",
-        "jest-get-type": "^29.6.3",
-        "leven": "^3.1.0",
-        "pretty-format": "^29.7.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-validate/node_modules/camelcase": {
-      "version": "6.3.0",
-      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
-      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-select-projects": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/jest-watch-select-projects/-/jest-watch-select-projects-2.0.0.tgz",
-      "integrity": "sha512-j00nW4dXc2NiCW6znXgFLF9g8PJ0zP25cpQ1xRro/HU2GBfZQFZD0SoXnAlaoKkIY4MlfTMkKGbNXFpvCdjl1w==",
-      "dependencies": {
-        "ansi-escapes": "^4.3.0",
-        "chalk": "^3.0.0",
-        "prompts": "^2.2.1"
-      }
-    },
-    "node_modules/jest-watch-select-projects/node_modules/chalk": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
-      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
-      "dependencies": {
-        "ansi-styles": "^4.1.0",
-        "supports-color": "^7.1.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/jest-watch-typeahead": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-2.2.1.tgz",
-      "integrity": "sha512-jYpYmUnTzysmVnwq49TAxlmtOAwp8QIqvZyoofQFn8fiWhEDZj33ZXzg3JA4nGnzWFm1hbWf3ADpteUokvXgFA==",
-      "dependencies": {
-        "ansi-escapes": "^6.0.0",
-        "chalk": "^4.0.0",
-        "jest-regex-util": "^29.0.0",
-        "jest-watcher": "^29.0.0",
-        "slash": "^5.0.0",
-        "string-length": "^5.0.1",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
-      },
-      "peerDependencies": {
-        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
-      "version": "6.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
-      "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
-      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
-      "engines": {
-        "node": ">=12.20"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/slash": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
-      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
-      "engines": {
-        "node": ">=14.16"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watch-typeahead/node_modules/string-length": {
-      "version": "5.0.1",
-      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
-      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
-      "dependencies": {
-        "char-regex": "^2.0.0",
-        "strip-ansi": "^7.0.1"
-      },
-      "engines": {
-        "node": ">=12.20"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/jest-watcher": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
-      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
-      "dependencies": {
-        "@jest/test-result": "^29.7.0",
-        "@jest/types": "^29.6.3",
-        "@types/node": "*",
-        "ansi-escapes": "^4.2.1",
-        "chalk": "^4.0.0",
-        "emittery": "^0.13.1",
-        "jest-util": "^29.7.0",
-        "string-length": "^4.0.1"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker": {
-      "version": "29.7.0",
-      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
-      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
-      "dependencies": {
-        "@types/node": "*",
-        "jest-util": "^29.7.0",
-        "merge-stream": "^2.0.0",
-        "supports-color": "^8.0.0"
-      },
-      "engines": {
-        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
-      }
-    },
-    "node_modules/jest-worker/node_modules/supports-color": {
-      "version": "8.1.1",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
-      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
-      "dependencies": {
-        "has-flag": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/chalk/supports-color?sponsor=1"
-      }
-    },
-    "node_modules/jimp-compact": {
-      "version": "0.16.1",
-      "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz",
-      "integrity": "sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="
-    },
-    "node_modules/jiti": {
-      "version": "1.21.7",
-      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
-      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
-      "bin": {
-        "jiti": "bin/jiti.js"
-      }
-    },
-    "node_modules/join-component": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz",
-      "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="
-    },
-    "node_modules/js-tokens": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
-      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
-    },
-    "node_modules/js-yaml": {
-      "version": "3.14.1",
-      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
-      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
-      "dependencies": {
-        "argparse": "^1.0.7",
-        "esprima": "^4.0.0"
-      },
-      "bin": {
-        "js-yaml": "bin/js-yaml.js"
-      }
-    },
-    "node_modules/jsc-android": {
-      "version": "250231.0.0",
-      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
-      "integrity": "sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw=="
-    },
-    "node_modules/jsc-safe-url": {
-      "version": "0.2.4",
-      "resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
-      "integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
-    },
-    "node_modules/jscodeshift": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
-      "integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
-      "dependencies": {
-        "@babel/core": "^7.13.16",
-        "@babel/parser": "^7.13.16",
-        "@babel/plugin-proposal-class-properties": "^7.13.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
-        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
-        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
-        "@babel/preset-flow": "^7.13.13",
-        "@babel/preset-typescript": "^7.13.0",
-        "@babel/register": "^7.13.16",
-        "babel-core": "^7.0.0-bridge.0",
-        "chalk": "^4.1.2",
-        "flow-parser": "0.*",
-        "graceful-fs": "^4.2.4",
-        "micromatch": "^4.0.4",
-        "neo-async": "^2.5.0",
-        "node-dir": "^0.1.17",
-        "recast": "^0.21.0",
-        "temp": "^0.8.4",
-        "write-file-atomic": "^2.3.0"
-      },
-      "bin": {
-        "jscodeshift": "bin/jscodeshift.js"
-      },
-      "peerDependencies": {
-        "@babel/preset-env": "^7.1.6"
-      }
-    },
-    "node_modules/jsdom": {
-      "version": "20.0.3",
-      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
-      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
-      "dependencies": {
-        "abab": "^2.0.6",
-        "acorn": "^8.8.1",
-        "acorn-globals": "^7.0.0",
-        "cssom": "^0.5.0",
-        "cssstyle": "^2.3.0",
-        "data-urls": "^3.0.2",
-        "decimal.js": "^10.4.2",
-        "domexception": "^4.0.0",
-        "escodegen": "^2.0.0",
-        "form-data": "^4.0.0",
-        "html-encoding-sniffer": "^3.0.0",
-        "http-proxy-agent": "^5.0.0",
-        "https-proxy-agent": "^5.0.1",
-        "is-potential-custom-element-name": "^1.0.1",
-        "nwsapi": "^2.2.2",
-        "parse5": "^7.1.1",
-        "saxes": "^6.0.0",
-        "symbol-tree": "^3.2.4",
-        "tough-cookie": "^4.1.2",
-        "w3c-xmlserializer": "^4.0.0",
-        "webidl-conversions": "^7.0.0",
-        "whatwg-encoding": "^2.0.0",
-        "whatwg-mimetype": "^3.0.0",
-        "whatwg-url": "^11.0.0",
-        "ws": "^8.11.0",
-        "xml-name-validator": "^4.0.0"
-      },
-      "engines": {
-        "node": ">=14"
-      },
-      "peerDependencies": {
-        "canvas": "^2.5.0"
-      },
-      "peerDependenciesMeta": {
-        "canvas": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/jsdom/node_modules/form-data": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
-      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
-      "dependencies": {
-        "asynckit": "^0.4.0",
-        "combined-stream": "^1.0.8",
-        "es-set-tostringtag": "^2.1.0",
-        "mime-types": "^2.1.12"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/jsdom/node_modules/tr46": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
-      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
-      "dependencies": {
-        "punycode": "^2.1.1"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdom/node_modules/webidl-conversions": {
-      "version": "7.0.0",
-      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
-      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsdom/node_modules/whatwg-url": {
-      "version": "11.0.0",
-      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
-      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
-      "dependencies": {
-        "tr46": "^3.0.0",
-        "webidl-conversions": "^7.0.0"
-      },
-      "engines": {
-        "node": ">=12"
-      }
-    },
-    "node_modules/jsesc": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
-      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
-      "bin": {
-        "jsesc": "bin/jsesc"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/json-buffer": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
-      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
-      "dev": true
-    },
-    "node_modules/json-parse-better-errors": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
-      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
-    },
-    "node_modules/json-parse-even-better-errors": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
-      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
-    },
-    "node_modules/json-schema-deref-sync": {
-      "version": "0.13.0",
-      "resolved": "https://registry.npmjs.org/json-schema-deref-sync/-/json-schema-deref-sync-0.13.0.tgz",
-      "integrity": "sha512-YBOEogm5w9Op337yb6pAT6ZXDqlxAsQCanM3grid8lMWNxRJO/zWEJi3ZzqDL8boWfwhTFym5EFrNgWwpqcBRg==",
-      "peer": true,
-      "dependencies": {
-        "clone": "^2.1.2",
-        "dag-map": "~1.0.0",
-        "is-valid-path": "^0.1.1",
-        "lodash": "^4.17.13",
-        "md5": "~2.2.0",
-        "memory-cache": "~0.2.0",
-        "traverse": "~0.6.6",
-        "valid-url": "~1.0.9"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/json-schema-deref-sync/node_modules/clone": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-2.1.2.tgz",
-      "integrity": "sha512-3Pe/CF1Nn94hyhIYpjtiLhdCoEoz0DqQ+988E9gmeEdQZlojxnOb74wctFyuwWQHzqyf9X7C7MG8juUpqBJT8w==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.8"
-      }
-    },
-    "node_modules/json-schema-deref-sync/node_modules/md5": {
-      "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.2.1.tgz",
-      "integrity": "sha512-PlGG4z5mBANDGCKsYQe0CaUYHdZYZt8ZPZLmEt+Urf0W4GlpTX4HescwHU+dc9+Z/G/vZKYZYFrwgm9VxK6QOQ==",
-      "peer": true,
-      "dependencies": {
-        "charenc": "~0.0.1",
-        "crypt": "~0.0.1",
-        "is-buffer": "~1.1.1"
-      }
-    },
-    "node_modules/json-schema-traverse": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
-      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg=="
-    },
-    "node_modules/json-stable-stringify-without-jsonify": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
-      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
-      "dev": true
-    },
-    "node_modules/json5": {
-      "version": "2.2.3",
-      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
-      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
-      "bin": {
-        "json5": "lib/cli.js"
-      },
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/jsonfile": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
-      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
-      "optionalDependencies": {
-        "graceful-fs": "^4.1.6"
-      }
-    },
-    "node_modules/jsx-ast-utils": {
-      "version": "3.3.5",
-      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
-      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
-      "dev": true,
-      "dependencies": {
-        "array-includes": "^3.1.6",
-        "array.prototype.flat": "^1.3.1",
-        "object.assign": "^4.1.4",
-        "object.values": "^1.1.6"
-      },
-      "engines": {
-        "node": ">=4.0"
-      }
-    },
-    "node_modules/keyv": {
-      "version": "4.5.4",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
-      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
-      "dev": true,
-      "dependencies": {
-        "json-buffer": "3.0.1"
-      }
-    },
-    "node_modules/kind-of": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
-      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/kleur": {
-      "version": "3.0.3",
-      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
-      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/launch-editor": {
-      "version": "2.10.0",
-      "resolved": "https://registry.npmjs.org/launch-editor/-/launch-editor-2.10.0.tgz",
-      "integrity": "sha512-D7dBRJo/qcGX9xlvt/6wUYzQxjh5G1RvZPgPv8vi4KRU99DVQL/oW7tnVOCCTm2HGeo3C5HvGE5Yrh6UBoZ0vA==",
-      "dependencies": {
-        "picocolors": "^1.0.0",
-        "shell-quote": "^1.8.1"
-      }
-    },
-    "node_modules/level-blobs": {
-      "version": "0.1.7",
-      "resolved": "https://registry.npmjs.org/level-blobs/-/level-blobs-0.1.7.tgz",
-      "integrity": "sha512-n0iYYCGozLd36m/Pzm206+brIgXP8mxPZazZ6ZvgKr+8YwOZ8/PPpYC5zMUu2qFygRN8RO6WC/HH3XWMW7RMVg==",
-      "dependencies": {
-        "level-peek": "1.0.6",
-        "once": "^1.3.0",
-        "readable-stream": "^1.0.26-4"
-      }
-    },
-    "node_modules/level-filesystem": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/level-filesystem/-/level-filesystem-1.2.0.tgz",
-      "integrity": "sha512-PhXDuCNYpngpxp3jwMT9AYBMgOvB6zxj3DeuIywNKmZqFj2djj9XfT2XDVslfqmo0Ip79cAd3SBy3FsfOZPJ1g==",
-      "dependencies": {
-        "concat-stream": "^1.4.4",
-        "errno": "^0.1.1",
-        "fwd-stream": "^1.0.4",
-        "level-blobs": "^0.1.7",
-        "level-peek": "^1.0.6",
-        "level-sublevel": "^5.2.0",
-        "octal": "^1.0.0",
-        "once": "^1.3.0",
-        "xtend": "^2.2.0"
-      }
-    },
-    "node_modules/level-filesystem/node_modules/xtend": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.2.0.tgz",
-      "integrity": "sha512-SLt5uylT+4aoXxXuwtQp5ZnMMzhDb1Xkg4pEqc00WUJCQifPfV9Ub1VrNhp9kXkrjZD2I2Hl8WnjP37jzZLPZw==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/level-fix-range": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-1.0.2.tgz",
-      "integrity": "sha512-9llaVn6uqBiSlBP+wKiIEoBa01FwEISFgHSZiyec2S0KpyLUkGR4afW/FCZ/X8y+QJvzS0u4PGOlZDdh1/1avQ=="
-    },
-    "node_modules/level-hooks": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/level-hooks/-/level-hooks-4.5.0.tgz",
-      "integrity": "sha512-fxLNny/vL/G4PnkLhWsbHnEaRi+A/k8r5EH/M77npZwYL62RHi2fV0S824z3QdpAk6VTgisJwIRywzBHLK4ZVA==",
-      "dependencies": {
-        "string-range": "~1.2"
-      }
-    },
-    "node_modules/level-peek": {
-      "version": "1.0.6",
-      "resolved": "https://registry.npmjs.org/level-peek/-/level-peek-1.0.6.tgz",
-      "integrity": "sha512-TKEzH5TxROTjQxWMczt9sizVgnmJ4F3hotBI48xCTYvOKd/4gA/uY0XjKkhJFo6BMic8Tqjf6jFMLWeg3MAbqQ==",
-      "dependencies": {
-        "level-fix-range": "~1.0.2"
-      }
-    },
-    "node_modules/level-sublevel": {
-      "version": "5.2.3",
-      "resolved": "https://registry.npmjs.org/level-sublevel/-/level-sublevel-5.2.3.tgz",
-      "integrity": "sha512-tO8jrFp+QZYrxx/Gnmjawuh1UBiifpvKNAcm4KCogesWr1Nm2+ckARitf+Oo7xg4OHqMW76eAqQ204BoIlscjA==",
-      "dependencies": {
-        "level-fix-range": "2.0",
-        "level-hooks": ">=4.4.0 <5",
-        "string-range": "~1.2.1",
-        "xtend": "~2.0.4"
-      }
-    },
-    "node_modules/level-sublevel/node_modules/clone": {
-      "version": "0.1.19",
-      "resolved": "https://registry.npmjs.org/clone/-/clone-0.1.19.tgz",
-      "integrity": "sha512-IO78I0y6JcSpEPHzK4obKdsL7E7oLdRVDVOLwr2Hkbjsb+Eoz0dxW6tef0WizoKu0gLC4oZSZuEF4U2K6w1WQw==",
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/level-sublevel/node_modules/level-fix-range": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/level-fix-range/-/level-fix-range-2.0.0.tgz",
-      "integrity": "sha512-WrLfGWgwWbYPrHsYzJau+5+te89dUbENBg3/lsxOs4p2tYOhCHjbgXxBAj4DFqp3k/XBwitcRXoCh8RoCogASA==",
-      "dependencies": {
-        "clone": "~0.1.9"
-      }
-    },
-    "node_modules/level-sublevel/node_modules/object-keys": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-0.2.0.tgz",
-      "integrity": "sha512-XODjdR2pBh/1qrjPcbSeSgEtKbYo7LqYNq64/TPuCf7j9SfDD3i21yatKoIy39yIWNvVM59iutfQQpCv1RfFzA==",
-      "deprecated": "Please update to the latest object-keys",
-      "dependencies": {
-        "foreach": "~2.0.1",
-        "indexof": "~0.0.1",
-        "is": "~0.2.6"
-      }
-    },
-    "node_modules/level-sublevel/node_modules/xtend": {
-      "version": "2.0.6",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-2.0.6.tgz",
-      "integrity": "sha512-fOZg4ECOlrMl+A6Msr7EIFcON1L26mb4NY5rurSkOex/TWhazOrg6eXD/B0XkuiYcYhQDWLXzQxLMVJ7LXwokg==",
-      "dependencies": {
-        "is-object": "~0.1.2",
-        "object-keys": "~0.2.0"
-      },
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/levelup": {
-      "version": "0.18.6",
-      "resolved": "https://registry.npmjs.org/levelup/-/levelup-0.18.6.tgz",
-      "integrity": "sha512-uB0auyRqIVXx+hrpIUtol4VAPhLRcnxcOsd2i2m6rbFIDarO5dnrupLOStYYpEcu8ZT087Z9HEuYw1wjr6RL6Q==",
-      "deprecated": "Superseded by abstract-level (https://github.com/Level/community#faq)",
-      "dependencies": {
-        "bl": "~0.8.1",
-        "deferred-leveldown": "~0.2.0",
-        "errno": "~0.1.1",
-        "prr": "~0.0.0",
-        "readable-stream": "~1.0.26",
-        "semver": "~2.3.1",
-        "xtend": "~3.0.0"
-      }
-    },
-    "node_modules/levelup/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
-    "node_modules/levelup/node_modules/prr": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-0.0.0.tgz",
-      "integrity": "sha512-LmUECmrW7RVj6mDWKjTXfKug7TFGdiz9P18HMcO4RHL+RW7MCOGNvpj5j47Rnp6ne6r4fZ2VzyUWEpKbg+tsjQ=="
-    },
-    "node_modules/levelup/node_modules/readable-stream": {
-      "version": "1.0.34",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.0.34.tgz",
-      "integrity": "sha512-ok1qVCJuRkNmvebYikljxJA/UEsKwLl2nI1OmaqAu4/UE+h0wKCHok4XkL/gvi39OacXvw59RJUOFUkDib2rHg==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/levelup/node_modules/semver": {
-      "version": "2.3.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-2.3.2.tgz",
-      "integrity": "sha512-abLdIKCosKfpnmhS52NCTjO4RiLspDfsn37prjzGrp9im5DPJOgh82Os92vtwGh6XdQryKI/7SREZnV+aqiXrA==",
-      "bin": {
-        "semver": "bin/semver"
-      }
-    },
-    "node_modules/levelup/node_modules/xtend": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-3.0.0.tgz",
-      "integrity": "sha512-sp/sT9OALMjRW1fKDlPeuSZlDQpkqReA0pyJukniWbTGoEKefHxhGJynE3PNhUMlcM8qWIjPwecwCw4LArS5Eg==",
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
-    "node_modules/leven": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
-      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/levn": {
-      "version": "0.4.1",
-      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
-      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
-      "dev": true,
-      "dependencies": {
-        "prelude-ls": "^1.2.1",
-        "type-check": "~0.4.0"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/lighthouse-logger": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
-      "integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
-      "dependencies": {
-        "debug": "^2.6.9",
-        "marky": "^1.2.2"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/lighthouse-logger/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/lightningcss": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz",
-      "integrity": "sha512-8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ==",
-      "dependencies": {
-        "detect-libc": "^1.0.3"
-      },
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      },
-      "optionalDependencies": {
-        "lightningcss-darwin-arm64": "1.27.0",
-        "lightningcss-darwin-x64": "1.27.0",
-        "lightningcss-freebsd-x64": "1.27.0",
-        "lightningcss-linux-arm-gnueabihf": "1.27.0",
-        "lightningcss-linux-arm64-gnu": "1.27.0",
-        "lightningcss-linux-arm64-musl": "1.27.0",
-        "lightningcss-linux-x64-gnu": "1.27.0",
-        "lightningcss-linux-x64-musl": "1.27.0",
-        "lightningcss-win32-arm64-msvc": "1.27.0",
-        "lightningcss-win32-x64-msvc": "1.27.0"
-      }
-    },
-    "node_modules/lightningcss-darwin-arm64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz",
-      "integrity": "sha512-Gl/lqIXY+d+ySmMbgDf0pgaWSqrWYxVHoc88q+Vhf2YNzZ8DwoRzGt5NZDVqqIW5ScpSnmmjcgXP87Dn2ylSSQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-darwin-x64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz",
-      "integrity": "sha512-0+mZa54IlcNAoQS9E0+niovhyjjQWEMrwW0p2sSdLRhLDc8LMQ/b67z7+B5q4VmjYCMSfnFi3djAAQFIDuj/Tg==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "darwin"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-freebsd-x64": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz",
-      "integrity": "sha512-n1sEf85fePoU2aDN2PzYjoI8gbBqnmLGEhKq7q0DKLj0UTVmOTwDC7PtLcy/zFxzASTSBlVQYJUhwIStQMIpRA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "freebsd"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm-gnueabihf": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz",
-      "integrity": "sha512-MUMRmtdRkOkd5z3h986HOuNBD1c2lq2BSQA1Jg88d9I7bmPGx08bwGcnB75dvr17CwxjxD6XPi3Qh8ArmKFqCA==",
-      "cpu": [
-        "arm"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-gnu": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz",
-      "integrity": "sha512-cPsxo1QEWq2sfKkSq2Bq5feQDHdUEwgtA9KaB27J5AX22+l4l0ptgjMZZtYtUnteBofjee+0oW1wQ1guv04a7A==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-arm64-musl": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz",
-      "integrity": "sha512-rCGBm2ax7kQ9pBSeITfCW9XSVF69VX+fm5DIpvDZQl4NnQoMQyRwhZQm9pd59m8leZ1IesRqWk2v/DntMo26lg==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
-      }
-    },
-    "node_modules/lightningcss-linux-x64-gnu": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz",
-      "integrity": "sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
+    "node_modules/jest-matcher-utils": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-matcher-utils/-/jest-matcher-utils-29.7.0.tgz",
+      "integrity": "sha512-sBkD+Xi9DtcChsI3L3u0+N0opgPYnCRPtGcQYrgXmR+hmt/fYfWAL0xRXYU8eWOdfuLgBe0YCW3AFtnRLagq/g==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "pretty-format": "^29.7.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/lightningcss-linux-x64-musl": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz",
-      "integrity": "sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "linux"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
+    "node_modules/jest-message-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-message-util/-/jest-message-util-29.7.0.tgz",
+      "integrity": "sha512-GBEV4GRADeP+qtB2+6u61stea8mGcOT4mCtrYISZwfu9/ISHFJ/5zOMXYbpBE9RsS5+Gb63DW4FgmnKJ79Kf6w==",
+      "dependencies": {
+        "@babel/code-frame": "^7.12.13",
+        "@jest/types": "^29.6.3",
+        "@types/stack-utils": "^2.0.0",
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "micromatch": "^4.0.4",
+        "pretty-format": "^29.7.0",
+        "slash": "^3.0.0",
+        "stack-utils": "^2.0.3"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/lightningcss-win32-arm64-msvc": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz",
-      "integrity": "sha512-/wXegPS1hnhkeG4OXQKEMQeJd48RDC3qdh+OA8pCuOPCyvnm/yEayrJdJVqzBsqpy1aJklRCVxscpFur80o6iQ==",
-      "cpu": [
-        "arm64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
-      "engines": {
-        "node": ">= 12.0.0"
+    "node_modules/jest-mock": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-mock/-/jest-mock-29.7.0.tgz",
+      "integrity": "sha512-ITOMZn+UkYS4ZFh83xYAOzWStloNzJFO2s8DWrE4lhtGD+AorgnbkiKERe4wQVBydIGPx059g6riW5Btp6Llnw==",
+      "dependencies": {
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "jest-util": "^29.7.0"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/lightningcss-win32-x64-msvc": {
-      "version": "1.27.0",
-      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz",
-      "integrity": "sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==",
-      "cpu": [
-        "x64"
-      ],
-      "optional": true,
-      "os": [
-        "win32"
-      ],
+    "node_modules/jest-pnp-resolver": {
+      "version": "1.2.3",
+      "resolved": "https://registry.npmjs.org/jest-pnp-resolver/-/jest-pnp-resolver-1.2.3.tgz",
+      "integrity": "sha512-+3NpwQEnRoIBtx4fyhblQDPgJI0H1IEIkX7ShLUjPGA7TtUTvI1oiKi3SR4oBR0hQhQR80l4WAe5RrXBwWMA8w==",
       "engines": {
-        "node": ">= 12.0.0"
+        "node": ">=6"
       },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/parcel"
+      "peerDependencies": {
+        "jest-resolve": "*"
+      },
+      "peerDependenciesMeta": {
+        "jest-resolve": {
+          "optional": true
+        }
       }
     },
-    "node_modules/lilconfig": {
-      "version": "3.1.3",
-      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
-      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
+    "node_modules/jest-regex-util": {
+      "version": "29.6.3",
+      "resolved": "https://registry.npmjs.org/jest-regex-util/-/jest-regex-util-29.6.3.tgz",
+      "integrity": "sha512-KJJBsRCyyLNWCNBOvZyRDnAIfUiRJ8v+hOBQYGn8gDyF3UegwiP4gwRR3/SDa42g1YbVycTidUF3rKjyLFDWbg==",
       "engines": {
-        "node": ">=14"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/antonk52"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/lines-and-columns": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
-      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
-    },
-    "node_modules/loader-runner": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
-      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+    "node_modules/jest-resolve": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve/-/jest-resolve-29.7.0.tgz",
+      "integrity": "sha512-IOVhZSrg+UvVAshDSDtHyFCCBUl/Q3AAJv8iZ6ZjnZ74xzvwuzLXid9IIIPgTnY62SJjfuupMKZsZQRsCvxEgA==",
+      "dependencies": {
+        "chalk": "^4.0.0",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-pnp-resolver": "^1.2.2",
+        "jest-util": "^29.7.0",
+        "jest-validate": "^29.7.0",
+        "resolve": "^1.20.0",
+        "resolve.exports": "^2.0.0",
+        "slash": "^3.0.0"
+      },
       "engines": {
-        "node": ">=6.11.5"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/loader-utils": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/loader-utils/-/loader-utils-2.0.4.tgz",
-      "integrity": "sha512-xXqpXoINfFhgua9xiqD8fPFHgkoq1mmmpE92WlDbm9rNRd/EbRb+Gqf908T2DMfuHjjJlksiK2RbHVOdD/MqSw==",
+    "node_modules/jest-resolve-dependencies": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-resolve-dependencies/-/jest-resolve-dependencies-29.7.0.tgz",
+      "integrity": "sha512-un0zD/6qxJ+S0et7WxeI3H5XSe9lTBBR7bOHCHXkKR6luG5mwDDlIzVQ0V5cZCuoTgEdcdwzTghYkTWfubi+nA==",
       "dependencies": {
-        "big.js": "^5.2.2",
-        "emojis-list": "^3.0.0",
-        "json5": "^2.1.2"
+        "jest-regex-util": "^29.6.3",
+        "jest-snapshot": "^29.7.0"
       },
       "engines": {
-        "node": ">=8.9.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/locate-path": {
-      "version": "6.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
-      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
+    "node_modules/jest-runner": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runner/-/jest-runner-29.7.0.tgz",
+      "integrity": "sha512-fsc4N6cPCAahybGBfTRcq5wFR6fpLznMg47sY5aDpsoejOcVYFb07AHuSnR0liMcPTgBsA3ZJL6kFOjPdoNipQ==",
       "dependencies": {
-        "p-locate": "^5.0.0"
+        "@jest/console": "^29.7.0",
+        "@jest/environment": "^29.7.0",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "graceful-fs": "^4.2.9",
+        "jest-docblock": "^29.7.0",
+        "jest-environment-node": "^29.7.0",
+        "jest-haste-map": "^29.7.0",
+        "jest-leak-detector": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-resolve": "^29.7.0",
+        "jest-runtime": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "jest-watcher": "^29.7.0",
+        "jest-worker": "^29.7.0",
+        "p-limit": "^3.1.0",
+        "source-map-support": "0.5.13"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/lodash": {
-      "version": "4.17.21",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
-      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
-    },
-    "node_modules/lodash.debounce": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
-      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
-    },
-    "node_modules/lodash.memoize": {
-      "version": "4.1.2",
-      "resolved": "https://registry.npmjs.org/lodash.memoize/-/lodash.memoize-4.1.2.tgz",
-      "integrity": "sha512-t7j+NzmgnQzTAYXcsHYLgimltOV1MXHtlOWf6GjL9Kj8GK5FInw5JotxvbOs+IvV1/Dzo04/fCGfLVs7aXb4Ag=="
-    },
-    "node_modules/lodash.merge": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
-      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
-      "dev": true
-    },
-    "node_modules/lodash.mergewith": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
-      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
+    "node_modules/jest-runner/node_modules/source-map": {
+      "version": "0.6.1",
+      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+      "engines": {
+        "node": ">=0.10.0"
+      }
     },
-    "node_modules/lodash.throttle": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
-      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+    "node_modules/jest-runner/node_modules/source-map-support": {
+      "version": "0.5.13",
+      "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.13.tgz",
+      "integrity": "sha512-SHSKFHadjVA5oR4PPqhtAVdcBWwRYVd6g6cAXnIbRiIwc2EhPrTuKUBdSLvlEKyIP3GCf89fltvcZiP9MMFA1w==",
+      "dependencies": {
+        "buffer-from": "^1.0.0",
+        "source-map": "^0.6.0"
+      }
     },
-    "node_modules/lodash.uniq": {
-      "version": "4.5.0",
-      "resolved": "https://registry.npmjs.org/lodash.uniq/-/lodash.uniq-4.5.0.tgz",
-      "integrity": "sha512-xfBaXQd9ryd9dlSDvnvI0lvxfLJlYAZzXomUYzLKtUeOQvOP5piqAWuGtrhWeqaXK9hhoM/iyJc5AV+XfsX3HQ=="
+    "node_modules/jest-runtime": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-runtime/-/jest-runtime-29.7.0.tgz",
+      "integrity": "sha512-gUnLjgwdGqW7B4LvOIkbKs9WGbn+QLqRQQ9juC6HndeDiezIwhDP+mhMwHWCEcfQ5RUXa6OPnFF8BJh5xegwwQ==",
+      "dependencies": {
+        "@jest/environment": "^29.7.0",
+        "@jest/fake-timers": "^29.7.0",
+        "@jest/globals": "^29.7.0",
+        "@jest/source-map": "^29.6.3",
+        "@jest/test-result": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "cjs-module-lexer": "^1.0.0",
+        "collect-v8-coverage": "^1.0.0",
+        "glob": "^7.1.3",
+        "graceful-fs": "^4.2.9",
+        "jest-haste-map": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-mock": "^29.7.0",
+        "jest-regex-util": "^29.6.3",
+        "jest-resolve": "^29.7.0",
+        "jest-snapshot": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "slash": "^3.0.0",
+        "strip-bom": "^4.0.0"
+      },
+      "engines": {
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
+      }
     },
-    "node_modules/log-symbols": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
-      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
+    "node_modules/jest-runtime/node_modules/glob": {
+      "version": "7.2.3",
+      "resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
+      "integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
+      "deprecated": "Glob versions prior to v9 are no longer supported",
       "dependencies": {
-        "chalk": "^2.0.1"
+        "fs.realpath": "^1.0.0",
+        "inflight": "^1.0.4",
+        "inherits": "2",
+        "minimatch": "^3.1.1",
+        "once": "^1.3.0",
+        "path-is-absolute": "^1.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "*"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/log-symbols/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/jest-snapshot": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-snapshot/-/jest-snapshot-29.7.0.tgz",
+      "integrity": "sha512-Rm0BMWtxBcioHr1/OX5YCP8Uov4riHvKPknOGs804Zg9JGZgmIBkbtlxJC/7Z4msKYVbIJtfU+tKb8xlYNfdkw==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "@babel/core": "^7.11.6",
+        "@babel/generator": "^7.7.2",
+        "@babel/plugin-syntax-jsx": "^7.7.2",
+        "@babel/plugin-syntax-typescript": "^7.7.2",
+        "@babel/types": "^7.3.3",
+        "@jest/expect-utils": "^29.7.0",
+        "@jest/transform": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "babel-preset-current-node-syntax": "^1.0.0",
+        "chalk": "^4.0.0",
+        "expect": "^29.7.0",
+        "graceful-fs": "^4.2.9",
+        "jest-diff": "^29.7.0",
+        "jest-get-type": "^29.6.3",
+        "jest-matcher-utils": "^29.7.0",
+        "jest-message-util": "^29.7.0",
+        "jest-util": "^29.7.0",
+        "natural-compare": "^1.4.0",
+        "pretty-format": "^29.7.0",
+        "semver": "^7.5.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/log-symbols/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+    "node_modules/jest-snapshot/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
       }
     },
-    "node_modules/log-symbols/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/jest-util": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-util/-/jest-util-29.7.0.tgz",
+      "integrity": "sha512-z6EbKajIpqGKU56y5KBUgy1dt1ihhQJgWzUlZHArA/+X2ad7Cb5iF+AK1EWVL/Bo7Rz9uurpqw6SiBCefUbCGA==",
       "dependencies": {
-        "color-name": "1.1.3"
-      }
-    },
-    "node_modules/log-symbols/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
-    },
-    "node_modules/log-symbols/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "chalk": "^4.0.0",
+        "ci-info": "^3.2.0",
+        "graceful-fs": "^4.2.9",
+        "picomatch": "^2.2.3"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/log-symbols/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+    "node_modules/jest-util/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
-        "node": ">=4"
+        "node": ">=8.6"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/log-symbols/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/jest-validate": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-validate/-/jest-validate-29.7.0.tgz",
+      "integrity": "sha512-ZB7wHqaRGVw/9hST/OuFUReG7M8vKeq0/J2egIGLdvjHCmYqGARhzXmtgi+gVeZ5uXFF219aOc3Ls2yLg27tkw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "@jest/types": "^29.6.3",
+        "camelcase": "^6.2.0",
+        "chalk": "^4.0.0",
+        "jest-get-type": "^29.6.3",
+        "leven": "^3.1.0",
+        "pretty-format": "^29.7.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/loose-envify": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
-      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
-      "dependencies": {
-        "js-tokens": "^3.0.0 || ^4.0.0"
+    "node_modules/jest-validate/node_modules/camelcase": {
+      "version": "6.3.0",
+      "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-6.3.0.tgz",
+      "integrity": "sha512-Gmy6FhYlCY7uOElZUSbxo2UCDH8owEk996gkbrpsgGtrJLM3J7jGxl9Ic7Qwwj4ivOE5AWZWRMecDdF7hqGjFA==",
+      "engines": {
+        "node": ">=10"
       },
-      "bin": {
-        "loose-envify": "cli.js"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/lower-case": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
-      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
-      "license": "MIT",
+    "node_modules/jest-watch-select-projects": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/jest-watch-select-projects/-/jest-watch-select-projects-2.0.0.tgz",
+      "integrity": "sha512-j00nW4dXc2NiCW6znXgFLF9g8PJ0zP25cpQ1xRro/HU2GBfZQFZD0SoXnAlaoKkIY4MlfTMkKGbNXFpvCdjl1w==",
       "dependencies": {
-        "tslib": "^2.0.3"
+        "ansi-escapes": "^4.3.0",
+        "chalk": "^3.0.0",
+        "prompts": "^2.2.1"
       }
     },
-    "node_modules/lru-cache": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
-      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
+    "node_modules/jest-watch-select-projects/node_modules/chalk": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-3.0.0.tgz",
+      "integrity": "sha512-4D3B6Wf41KOYRFdszmDqMCGq5VV/uMAB273JILmO+3jAlh8X4qDtdtgCR3fxtbLEMzSx22QdhnDcJvu2u1fVwg==",
       "dependencies": {
-        "yallist": "^3.0.2"
+        "ansi-styles": "^4.1.0",
+        "supports-color": "^7.1.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/ltgt": {
+    "node_modules/jest-watch-typeahead": {
       "version": "2.2.1",
-      "resolved": "https://registry.npmjs.org/ltgt/-/ltgt-2.2.1.tgz",
-      "integrity": "sha512-AI2r85+4MquTw9ZYqabu4nMwy9Oftlfa/e/52t9IjtfG+mGBbTNdAoZ3RQKLHR6r0wQnwZnPIEh/Ya6XTWAKNA==",
-      "peer": true
-    },
-    "node_modules/make-dir": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
-      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
+      "resolved": "https://registry.npmjs.org/jest-watch-typeahead/-/jest-watch-typeahead-2.2.1.tgz",
+      "integrity": "sha512-jYpYmUnTzysmVnwq49TAxlmtOAwp8QIqvZyoofQFn8fiWhEDZj33ZXzg3JA4nGnzWFm1hbWf3ADpteUokvXgFA==",
       "dependencies": {
-        "pify": "^4.0.1",
-        "semver": "^5.6.0"
+        "ansi-escapes": "^6.0.0",
+        "chalk": "^4.0.0",
+        "jest-regex-util": "^29.0.0",
+        "jest-watcher": "^29.0.0",
+        "slash": "^5.0.0",
+        "string-length": "^5.0.1",
+        "strip-ansi": "^7.0.1"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^14.17.0 || ^16.10.0 || >=18.0.0"
+      },
+      "peerDependencies": {
+        "jest": "^27.0.0 || ^28.0.0 || ^29.0.0"
       }
     },
-    "node_modules/make-dir/node_modules/semver": {
-      "version": "5.7.2",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
-      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
-      "bin": {
-        "semver": "bin/semver"
+    "node_modules/jest-watch-typeahead/node_modules/ansi-escapes": {
+      "version": "6.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-escapes/-/ansi-escapes-6.2.1.tgz",
+      "integrity": "sha512-4nJ3yixlEthEJ9Rk4vPcdBRkZvQZlYyu8j4/Mqz5sgIkddmEnH2Yj2ZrnP9S3tQOvSNRUIgVNF/1yPpRAGNRig==",
+      "engines": {
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/makeerror": {
-      "version": "1.0.12",
-      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
-      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
-      "dependencies": {
-        "tmpl": "1.0.5"
+    "node_modules/jest-watch-typeahead/node_modules/char-regex": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/char-regex/-/char-regex-2.0.2.tgz",
+      "integrity": "sha512-cbGOjAptfM2LVmWhwRFHEKTPkLwNddVmuqYZQt895yXwAsWsXObCG+YN4DGQ/JBtT4GP1a1lPPdio2z413LmTg==",
+      "engines": {
+        "node": ">=12.20"
       }
     },
-    "node_modules/marky": {
-      "version": "1.2.5",
-      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
-      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="
-    },
-    "node_modules/math-intrinsics": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
-      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
+    "node_modules/jest-watch-typeahead/node_modules/slash": {
+      "version": "5.1.0",
+      "resolved": "https://registry.npmjs.org/slash/-/slash-5.1.0.tgz",
+      "integrity": "sha512-ZA6oR3T/pEyuqwMgAKT0/hAv8oAXckzbkmR0UkUosQ+Mc4RxGoJkRmwHgHufaenlyAgE1Mxgpdcrf75y6XcnDg==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=14.16"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/md5": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
-      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
+    "node_modules/jest-watch-typeahead/node_modules/string-length": {
+      "version": "5.0.1",
+      "resolved": "https://registry.npmjs.org/string-length/-/string-length-5.0.1.tgz",
+      "integrity": "sha512-9Ep08KAMUn0OadnVaBuRdE2l615CQ508kr0XMadjClfYpdCyvrbFp6Taebo8yyxokQ4viUd/xPPUA4FGgUa0ow==",
       "dependencies": {
-        "charenc": "0.0.2",
-        "crypt": "0.0.2",
-        "is-buffer": "~1.1.6"
+        "char-regex": "^2.0.0",
+        "strip-ansi": "^7.0.1"
+      },
+      "engines": {
+        "node": ">=12.20"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/md5-file": {
-      "version": "3.2.3",
-      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
-      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
+    "node_modules/jest-watcher": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-watcher/-/jest-watcher-29.7.0.tgz",
+      "integrity": "sha512-49Fg7WXkU3Vl2h6LbLtMQ/HyB6rXSIX7SqvBLQmssRBGN9I0PNvPmAmCWSOY6SOvrjhI/F7/bGAv9RtnsPA03g==",
       "dependencies": {
-        "buffer-alloc": "^1.1.0"
-      },
-      "bin": {
-        "md5-file": "cli.js"
+        "@jest/test-result": "^29.7.0",
+        "@jest/types": "^29.6.3",
+        "@types/node": "*",
+        "ansi-escapes": "^4.2.1",
+        "chalk": "^4.0.0",
+        "emittery": "^0.13.1",
+        "jest-util": "^29.7.0",
+        "string-length": "^4.0.1"
       },
       "engines": {
-        "node": ">=0.10"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/md5hex": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/md5hex/-/md5hex-1.0.0.tgz",
-      "integrity": "sha512-c2YOUbp33+6thdCUi34xIyOU/a7bvGKj/3DB1iaPMTuPHf/Q2d5s4sn1FaCOO43XkXggnb08y5W2PU8UNYNLKQ==",
-      "peer": true
-    },
-    "node_modules/mdn-data": {
-      "version": "2.0.14",
-      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
-      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
-    },
-    "node_modules/media-typer": {
-      "version": "0.3.0",
-      "resolved": "https://registry.npmjs.org/media-typer/-/media-typer-0.3.0.tgz",
-      "integrity": "sha512-dq+qelQ9akHpcOl/gUVRTxVIOkAJ1wR3QAvb4RsVjS8oVoFjDGTc679wJYmUmknUF5HwMLOgb5O+a3KxfWapPQ==",
+    "node_modules/jest-worker": {
+      "version": "29.7.0",
+      "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-29.7.0.tgz",
+      "integrity": "sha512-eIz2msL/EzL9UFTFFx7jBTkeZfku0yUAyZZZmJ93H2TYEiroIx2PQjEXcwYtYl8zXCxb+PAmA2hLIt/6ZEkPHw==",
+      "dependencies": {
+        "@types/node": "*",
+        "jest-util": "^29.7.0",
+        "merge-stream": "^2.0.0",
+        "supports-color": "^8.0.0"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": "^14.15.0 || ^16.10.0 || >=18.0.0"
       }
     },
-    "node_modules/memfs": {
-      "version": "3.5.3",
-      "resolved": "https://registry.npmjs.org/memfs/-/memfs-3.5.3.tgz",
-      "integrity": "sha512-UERzLsxzllchadvbPs5aolHh65ISpKpM+ccLbOJ8/vvpBKmAWf+la7dXFy7Mr0ySHbdHrFv5kGFCUHHe6GFEmw==",
+    "node_modules/jest-worker/node_modules/supports-color": {
+      "version": "8.1.1",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
+      "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
       "dependencies": {
-        "fs-monkey": "^1.0.4"
+        "has-flag": "^4.0.0"
       },
       "engines": {
-        "node": ">= 4.0.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/chalk/supports-color?sponsor=1"
       }
     },
-    "node_modules/memoize-one": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
-      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
-    },
-    "node_modules/memory-cache": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/memory-cache/-/memory-cache-0.2.0.tgz",
-      "integrity": "sha512-OcjA+jzjOYzKmKS6IQVALHLVz+rNTMPoJvCztFaZxwG14wtAW7VRZjwTQu06vKCYOxh4jVnik7ya0SXTB0W+xA==",
-      "peer": true
+    "node_modules/jimp-compact": {
+      "version": "0.16.1",
+      "resolved": "https://registry.npmjs.org/jimp-compact/-/jimp-compact-0.16.1.tgz",
+      "integrity": "sha512-dZ6Ra7u1G8c4Letq/B5EzAxj4tLFHL+cGtdpR+PVm4yzPDj+lCk+AbivWt1eOM+ikzkowtyV7qSqX6qr3t71Ww=="
     },
-    "node_modules/merge-descriptors": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/merge-descriptors/-/merge-descriptors-1.0.3.tgz",
-      "integrity": "sha512-gaNvAS7TZ897/rVaZ0nMtAyxNyi/pdbjbAwUpFQpN70GqnVfOiXpeUUMKRBmzXaSQ8DdTX4/0ms62r2K+hE6mQ==",
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+    "node_modules/jiti": {
+      "version": "1.21.7",
+      "resolved": "https://registry.npmjs.org/jiti/-/jiti-1.21.7.tgz",
+      "integrity": "sha512-/imKNG4EbWNrVjoNC/1H5/9GFy+tqjGBHCaSsN+P2RnPqjsLmv6UD3Ej+Kj8nBWaRAwyk7kK5ZUc+OEatnTR3A==",
+      "bin": {
+        "jiti": "bin/jiti.js"
       }
     },
-    "node_modules/merge-stream": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
-      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
+    "node_modules/join-component": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/join-component/-/join-component-1.1.0.tgz",
+      "integrity": "sha512-bF7vcQxbODoGK1imE2P9GS9aw4zD0Sd+Hni68IMZLj7zRnquH7dXUmMw9hDI5S/Jzt7q+IyTXN0rSg2GI0IKhQ=="
     },
-    "node_modules/merge2": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
-      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
-      "engines": {
-        "node": ">= 8"
-      }
+    "node_modules/js-tokens": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/js-tokens/-/js-tokens-4.0.0.tgz",
+      "integrity": "sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ=="
     },
-    "node_modules/methods": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/methods/-/methods-1.1.2.tgz",
-      "integrity": "sha512-iclAHeNqNm68zFtnZ0e+1L2yUIdvzNoauKU4WBA3VvH/vPFieF7qfRlwUZU+DA9P9bPXIS90ulxoUoCH23sV2w==",
-      "engines": {
-        "node": ">= 0.6"
+    "node_modules/js-yaml": {
+      "version": "3.14.1",
+      "resolved": "https://registry.npmjs.org/js-yaml/-/js-yaml-3.14.1.tgz",
+      "integrity": "sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==",
+      "dependencies": {
+        "argparse": "^1.0.7",
+        "esprima": "^4.0.0"
+      },
+      "bin": {
+        "js-yaml": "bin/js-yaml.js"
       }
     },
-    "node_modules/metro": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro/-/metro-0.81.1.tgz",
-      "integrity": "sha512-fqRu4fg8ONW7VfqWFMGgKAcOuMzyoQah2azv9Y3VyFXAmG+AoTU6YIFWqAADESCGVWuWEIvxTJhMf3jxU6jwjA==",
+    "node_modules/jsc-android": {
+      "version": "250231.0.0",
+      "resolved": "https://registry.npmjs.org/jsc-android/-/jsc-android-250231.0.0.tgz",
+      "integrity": "sha512-rS46PvsjYmdmuz1OAWXY/1kCYG7pnf1TBqeTiOJr1iDz7s5DLxxC9n/ZMknLDxzYzNVfI7R95MH10emSSG1Wuw=="
+    },
+    "node_modules/jsc-safe-url": {
+      "version": "0.2.4",
+      "resolved": "https://registry.npmjs.org/jsc-safe-url/-/jsc-safe-url-0.2.4.tgz",
+      "integrity": "sha512-0wM3YBWtYePOjfyXQH5MWQ8H7sdk5EXSwZvmSLKk2RboVQ2Bu239jycHDz5J/8Blf3K0Qnoy2b6xD+z10MFB+Q=="
+    },
+    "node_modules/jscodeshift": {
+      "version": "0.14.0",
+      "resolved": "https://registry.npmjs.org/jscodeshift/-/jscodeshift-0.14.0.tgz",
+      "integrity": "sha512-7eCC1knD7bLUPuSCwXsMZUH51O8jIcoVyKtI6P0XM0IVzlGjckPy3FIwQlorzbN0Sg79oK+RlohN32Mqf/lrYA==",
       "dependencies": {
-        "@babel/code-frame": "^7.24.7",
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/parser": "^7.25.3",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.3",
-        "@babel/types": "^7.25.2",
-        "accepts": "^1.3.7",
-        "chalk": "^4.0.0",
-        "ci-info": "^2.0.0",
-        "connect": "^3.6.5",
-        "debug": "^2.2.0",
-        "error-stack-parser": "^2.0.6",
-        "flow-enums-runtime": "^0.0.6",
+        "@babel/core": "^7.13.16",
+        "@babel/parser": "^7.13.16",
+        "@babel/plugin-proposal-class-properties": "^7.13.0",
+        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.13.8",
+        "@babel/plugin-proposal-optional-chaining": "^7.13.12",
+        "@babel/plugin-transform-modules-commonjs": "^7.13.8",
+        "@babel/preset-flow": "^7.13.13",
+        "@babel/preset-typescript": "^7.13.0",
+        "@babel/register": "^7.13.16",
+        "babel-core": "^7.0.0-bridge.0",
+        "chalk": "^4.1.2",
+        "flow-parser": "0.*",
         "graceful-fs": "^4.2.4",
-        "hermes-parser": "0.25.1",
-        "image-size": "^1.0.2",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "jsc-safe-url": "^0.2.2",
-        "lodash.throttle": "^4.1.1",
-        "metro-babel-transformer": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-cache-key": "0.81.1",
-        "metro-config": "0.81.1",
-        "metro-core": "0.81.1",
-        "metro-file-map": "0.81.1",
-        "metro-resolver": "0.81.1",
-        "metro-runtime": "0.81.1",
-        "metro-source-map": "0.81.1",
-        "metro-symbolicate": "0.81.1",
-        "metro-transform-plugins": "0.81.1",
-        "metro-transform-worker": "0.81.1",
-        "mime-types": "^2.1.27",
-        "nullthrows": "^1.1.1",
-        "serialize-error": "^2.1.0",
-        "source-map": "^0.5.6",
-        "throat": "^5.0.0",
-        "ws": "^7.5.10",
-        "yargs": "^17.6.2"
+        "micromatch": "^4.0.4",
+        "neo-async": "^2.5.0",
+        "node-dir": "^0.1.17",
+        "recast": "^0.21.0",
+        "temp": "^0.8.4",
+        "write-file-atomic": "^2.3.0"
       },
       "bin": {
-        "metro": "src/cli.js"
+        "jscodeshift": "bin/jscodeshift.js"
       },
-      "engines": {
-        "node": ">=18.18"
+      "peerDependencies": {
+        "@babel/preset-env": "^7.1.6"
       }
     },
-    "node_modules/metro-babel-transformer": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.81.1.tgz",
-      "integrity": "sha512-JECKDrQaUnDmj0x/Q/c8c5YwsatVx38Lu+BfCwX9fR8bWipAzkvJocBpq5rOAJRDXRgDcPv2VO4Q4nFYrpYNQg==",
+    "node_modules/jsdom": {
+      "version": "20.0.3",
+      "resolved": "https://registry.npmjs.org/jsdom/-/jsdom-20.0.3.tgz",
+      "integrity": "sha512-SYhBvTh89tTfCD/CRdSOm13mOBa42iTaTyfyEWBdKcGdPxPtLFBXuHR8XHb33YNYaP+lLbmSvBTsnoesCNJEsQ==",
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "hermes-parser": "0.25.1",
-        "nullthrows": "^1.1.1"
+        "abab": "^2.0.6",
+        "acorn": "^8.8.1",
+        "acorn-globals": "^7.0.0",
+        "cssom": "^0.5.0",
+        "cssstyle": "^2.3.0",
+        "data-urls": "^3.0.2",
+        "decimal.js": "^10.4.2",
+        "domexception": "^4.0.0",
+        "escodegen": "^2.0.0",
+        "form-data": "^4.0.0",
+        "html-encoding-sniffer": "^3.0.0",
+        "http-proxy-agent": "^5.0.0",
+        "https-proxy-agent": "^5.0.1",
+        "is-potential-custom-element-name": "^1.0.1",
+        "nwsapi": "^2.2.2",
+        "parse5": "^7.1.1",
+        "saxes": "^6.0.0",
+        "symbol-tree": "^3.2.4",
+        "tough-cookie": "^4.1.2",
+        "w3c-xmlserializer": "^4.0.0",
+        "webidl-conversions": "^7.0.0",
+        "whatwg-encoding": "^2.0.0",
+        "whatwg-mimetype": "^3.0.0",
+        "whatwg-url": "^11.0.0",
+        "ws": "^8.11.0",
+        "xml-name-validator": "^4.0.0"
       },
       "engines": {
-        "node": ">=18.18"
-      }
-    },
-    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
-      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
-    },
-    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
-      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
-      "dependencies": {
-        "hermes-estree": "0.25.1"
+        "node": ">=14"
+      },
+      "peerDependencies": {
+        "canvas": "^2.5.0"
+      },
+      "peerDependenciesMeta": {
+        "canvas": {
+          "optional": true
+        }
       }
     },
-    "node_modules/metro-cache": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.81.1.tgz",
-      "integrity": "sha512-Uqcmn6sZ+Y0VJHM88VrG5xCvSeU7RnuvmjPmSOpEcyJJBe02QkfHL05MX2ZyGDTyZdbKCzaX0IijrTe4hN3F0Q==",
+    "node_modules/jsdom/node_modules/form-data": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/form-data/-/form-data-4.0.2.tgz",
+      "integrity": "sha512-hGfm/slu0ZabnNt4oaRZ6uREyfCj6P4fT/n6A1rGV+Z0VdGXjfOhVUpkn6qVQONHGIFwmveGXyDs75+nr6FM8w==",
       "dependencies": {
-        "exponential-backoff": "^3.1.1",
-        "flow-enums-runtime": "^0.0.6",
-        "metro-core": "0.81.1"
+        "asynckit": "^0.4.0",
+        "combined-stream": "^1.0.8",
+        "es-set-tostringtag": "^2.1.0",
+        "mime-types": "^2.1.12"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 6"
       }
     },
-    "node_modules/metro-cache-key": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.81.1.tgz",
-      "integrity": "sha512-5fDaHR1yTvpaQuwMAeEoZGsVyvjrkw9IFAS7WixSPvaNY5YfleqoJICPc6hbXFJjvwCCpwmIYFkjqzR/qJ6yqA==",
+    "node_modules/jsdom/node_modules/tr46": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/tr46/-/tr46-3.0.0.tgz",
+      "integrity": "sha512-l7FvfAHlcmulp8kr+flpQZmVwtu7nfRV7NZujtN0OqES8EL4O4e0qqzL0DC5gAvx/ZC/9lk6rhcUwYvkBnBnYA==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "punycode": "^2.1.1"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=12"
       }
     },
-    "node_modules/metro-config": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.81.1.tgz",
-      "integrity": "sha512-VAAJmxsKIZ+Fz5/z1LVgxa32gE6+2TvrDSSx45g85WoX4EtLmdBGP3DSlpQW3DqFUfNHJCGwMLGXpJnxifd08g==",
-      "dependencies": {
-        "connect": "^3.6.5",
-        "cosmiconfig": "^5.0.5",
-        "flow-enums-runtime": "^0.0.6",
-        "jest-validate": "^29.6.3",
-        "metro": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-core": "0.81.1",
-        "metro-runtime": "0.81.1"
-      },
+    "node_modules/jsdom/node_modules/webidl-conversions": {
+      "version": "7.0.0",
+      "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-7.0.0.tgz",
+      "integrity": "sha512-VwddBukDzu71offAQR975unBIGqfKZpM+8ZX6ySk8nYhVoo5CYaZyzt3YBvYtRtO+aoGlqxPg/B87NGVZ/fu6g==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">=12"
       }
     },
-    "node_modules/metro-core": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.81.1.tgz",
-      "integrity": "sha512-4d2/+02IYqOwJs4dmM0dC8hIZqTzgnx2nzN4GTCaXb3Dhtmi/SJ3v6744zZRnithhN4lxf8TTJSHnQV75M7SSA==",
+    "node_modules/jsdom/node_modules/whatwg-url": {
+      "version": "11.0.0",
+      "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-11.0.0.tgz",
+      "integrity": "sha512-RKT8HExMpoYx4igMiVMY83lN6UeITKJlBQ+vR/8ZJ8OCdSiN3RwCq+9gH0+Xzj0+5IrM6i4j/6LuvzbZIQgEcQ==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "lodash.throttle": "^4.1.1",
-        "metro-resolver": "0.81.1"
+        "tr46": "^3.0.0",
+        "webidl-conversions": "^7.0.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=12"
       }
     },
-    "node_modules/metro-file-map": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.81.1.tgz",
-      "integrity": "sha512-aY72H2ujmRfFxcsbyh83JgqFF+uQ4HFN1VhV2FmcfQG4s1bGKf2Vbkk+vtZ1+EswcBwDZFbkpvAjN49oqwGzAA==",
-      "dependencies": {
-        "debug": "^2.2.0",
-        "fb-watchman": "^2.0.0",
-        "flow-enums-runtime": "^0.0.6",
-        "graceful-fs": "^4.2.4",
-        "invariant": "^2.2.4",
-        "jest-worker": "^29.6.3",
-        "micromatch": "^4.0.4",
-        "nullthrows": "^1.1.1",
-        "walker": "^1.0.7"
+    "node_modules/jsesc": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/jsesc/-/jsesc-3.1.0.tgz",
+      "integrity": "sha512-/sM3dO2FOzXjKQhJuo0Q173wf2KOo8t4I8vHy6lF9poUp7bKT0/NHE8fPX23PwfhnykfqnC2xRxOnVw5XuGIaA==",
+      "bin": {
+        "jsesc": "bin/jsesc"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=6"
       }
     },
-    "node_modules/metro-file-map/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
+    "node_modules/json-buffer": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ==",
+      "dev": true
     },
-    "node_modules/metro-file-map/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    "node_modules/json-parse-better-errors": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/json-parse-better-errors/-/json-parse-better-errors-1.0.2.tgz",
+      "integrity": "sha512-mrqyZKfX5EhL7hvqcV6WG1yYjnjeuYDzDhhcAAUrq8Po85NBQBJP+ZDUT75qZQ98IkUoBqdkExkukOU7Ts2wrw=="
     },
-    "node_modules/metro-minify-terser": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.81.1.tgz",
-      "integrity": "sha512-p/Qz3NNh1nebSqMlxlUALAnESo6heQrnvgHtAuxufRPtKvghnVDq9hGGex8H7z7YYLsqe42PWdt4JxTA3mgkvg==",
-      "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "terser": "^5.15.0"
-      },
-      "engines": {
-        "node": ">=18.18"
-      }
+    "node_modules/json-parse-even-better-errors": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/json-parse-even-better-errors/-/json-parse-even-better-errors-2.3.1.tgz",
+      "integrity": "sha512-xyFwyhro/JEof6Ghe2iz2NcXoj2sloNsWr/XsERDK/oiPCfaNhl5ONfp+jQdAZRQQ0IJWNzH9zIZF7li91kh2w=="
     },
-    "node_modules/metro-react-native-babel-preset": {
-      "version": "0.73.9",
-      "resolved": "https://registry.npmjs.org/metro-react-native-babel-preset/-/metro-react-native-babel-preset-0.73.9.tgz",
-      "integrity": "sha512-AoD7v132iYDV4K78yN2OLgTPwtAKn0XlD2pOhzyBxiI8PeXzozhbKyPV7zUOJUPETj+pcEVfuYj5ZN/8+bhbCw==",
-      "peer": true,
-      "dependencies": {
-        "@babel/core": "^7.20.0",
-        "@babel/plugin-proposal-async-generator-functions": "^7.0.0",
-        "@babel/plugin-proposal-class-properties": "^7.0.0",
-        "@babel/plugin-proposal-export-default-from": "^7.0.0",
-        "@babel/plugin-proposal-nullish-coalescing-operator": "^7.0.0",
-        "@babel/plugin-proposal-object-rest-spread": "^7.0.0",
-        "@babel/plugin-proposal-optional-catch-binding": "^7.0.0",
-        "@babel/plugin-proposal-optional-chaining": "^7.0.0",
-        "@babel/plugin-syntax-dynamic-import": "^7.0.0",
-        "@babel/plugin-syntax-export-default-from": "^7.0.0",
-        "@babel/plugin-syntax-flow": "^7.18.0",
-        "@babel/plugin-syntax-nullish-coalescing-operator": "^7.0.0",
-        "@babel/plugin-syntax-optional-chaining": "^7.0.0",
-        "@babel/plugin-transform-arrow-functions": "^7.0.0",
-        "@babel/plugin-transform-async-to-generator": "^7.0.0",
-        "@babel/plugin-transform-block-scoping": "^7.0.0",
-        "@babel/plugin-transform-classes": "^7.0.0",
-        "@babel/plugin-transform-computed-properties": "^7.0.0",
-        "@babel/plugin-transform-destructuring": "^7.0.0",
-        "@babel/plugin-transform-flow-strip-types": "^7.0.0",
-        "@babel/plugin-transform-function-name": "^7.0.0",
-        "@babel/plugin-transform-literals": "^7.0.0",
-        "@babel/plugin-transform-modules-commonjs": "^7.0.0",
-        "@babel/plugin-transform-named-capturing-groups-regex": "^7.0.0",
-        "@babel/plugin-transform-parameters": "^7.0.0",
-        "@babel/plugin-transform-react-display-name": "^7.0.0",
-        "@babel/plugin-transform-react-jsx": "^7.0.0",
-        "@babel/plugin-transform-react-jsx-self": "^7.0.0",
-        "@babel/plugin-transform-react-jsx-source": "^7.0.0",
-        "@babel/plugin-transform-runtime": "^7.0.0",
-        "@babel/plugin-transform-shorthand-properties": "^7.0.0",
-        "@babel/plugin-transform-spread": "^7.0.0",
-        "@babel/plugin-transform-sticky-regex": "^7.0.0",
-        "@babel/plugin-transform-template-literals": "^7.0.0",
-        "@babel/plugin-transform-typescript": "^7.5.0",
-        "@babel/plugin-transform-unicode-regex": "^7.0.0",
-        "@babel/template": "^7.0.0",
-        "react-refresh": "^0.4.0"
+    "node_modules/json-schema-traverse": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-0.4.1.tgz",
+      "integrity": "sha512-xbbCH5dCYU5T8LcEhhuh7HJ88HXuW3qsI3Y0zOZFKfZEHcpWiHU/Jxzk629Brsab/mMiHQti9wMP+845RPe3Vg==",
+      "dev": true
+    },
+    "node_modules/json-stable-stringify-without-jsonify": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz",
+      "integrity": "sha512-Bdboy+l7tA3OGW6FjyFHWkP5LuByj1Tk33Ljyq0axyzdk9//JSi2u3fP1QSmd1KNwq6VOKYGlAu87CisVir6Pw==",
+      "dev": true
+    },
+    "node_modules/json5": {
+      "version": "2.2.3",
+      "resolved": "https://registry.npmjs.org/json5/-/json5-2.2.3.tgz",
+      "integrity": "sha512-XmOWe7eyHYH14cLdVPoyg+GOH3rYX++KpzrylJwSW98t3Nk+U8XOl8FWKOgwtzdb8lXGf6zYwDUzeHMWfxasyg==",
+      "bin": {
+        "json5": "lib/cli.js"
       },
-      "peerDependencies": {
-        "@babel/core": "*"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/metro-react-native-babel-preset/node_modules/react-refresh": {
-      "version": "0.4.3",
-      "resolved": "https://registry.npmjs.org/react-refresh/-/react-refresh-0.4.3.tgz",
-      "integrity": "sha512-Hwln1VNuGl/6bVwnd0Xdn1e84gT/8T9aYNL+HAKDArLCS7LWjwr7StE30IEYbIkx0Vi3vs+coQxe+SQDbGbbpA==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/jsonfile": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
+      "integrity": "sha512-m6F1R3z8jjlf2imQHS2Qez5sjKWQzbuuhuJ/FKYFRZvPE3PuHcSMVZzfsLhGVOkfd20obL5SWEBew5ShlquNxg==",
+      "optionalDependencies": {
+        "graceful-fs": "^4.1.6"
       }
     },
-    "node_modules/metro-resolver": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.81.1.tgz",
-      "integrity": "sha512-E61t6fxRoYRkl6Zo3iUfCKW4DYfum/bLjcejXBMt1y3I7LFkK84TCR/Rs9OAwsMCY/7GOPB4+CREYZOtCC7CNA==",
+    "node_modules/jsx-ast-utils": {
+      "version": "3.3.5",
+      "resolved": "https://registry.npmjs.org/jsx-ast-utils/-/jsx-ast-utils-3.3.5.tgz",
+      "integrity": "sha512-ZZow9HBI5O6EPgSJLUb8n2NKgmVWTwCvHGwFuJlMjvLFqlGG6pjirPhtdsseaLZjSibD8eegzmYpUZwoIlj2cQ==",
+      "dev": true,
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "array-includes": "^3.1.6",
+        "array.prototype.flat": "^1.3.1",
+        "object.assign": "^4.1.4",
+        "object.values": "^1.1.6"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">=4.0"
       }
     },
-    "node_modules/metro-runtime": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.81.1.tgz",
-      "integrity": "sha512-pqu5j5d01rjF85V/K8SDDJ0NR3dRp6bE3z5bKVVb5O2Rx0nbR9KreUxYALQCRCcQHaYySqCg5fYbGKBHC295YQ==",
+    "node_modules/keyv": {
+      "version": "4.5.4",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.5.4.tgz",
+      "integrity": "sha512-oxVHkHR/EJf2CNXnWxRLW6mg7JyCCUcG0DtEGmL2ctUo1PNTin1PUil+r/+4r5MpVgC/fn1kjsx7mjSujKqIpw==",
+      "dev": true,
       "dependencies": {
-        "@babel/runtime": "^7.25.0",
-        "flow-enums-runtime": "^0.0.6"
-      },
-      "engines": {
-        "node": ">=18.18"
+        "json-buffer": "3.0.1"
       }
     },
-    "node_modules/metro-source-map": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.1.tgz",
-      "integrity": "sha512-1i8ROpNNiga43F0ZixAXoFE/SS3RqcRDCCslpynb+ytym0VI7pkTH1woAN2HI9pczYtPrp3Nq0AjRpsuY35ieA==",
-      "dependencies": {
-        "@babel/traverse": "^7.25.3",
-        "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
-        "@babel/types": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "invariant": "^2.2.4",
-        "metro-symbolicate": "0.81.1",
-        "nullthrows": "^1.1.1",
-        "ob1": "0.81.1",
-        "source-map": "^0.5.6",
-        "vlq": "^1.0.0"
-      },
+    "node_modules/kind-of": {
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-6.0.3.tgz",
+      "integrity": "sha512-dcS1ul+9tmeD95T+x28/ehLgd9mENa3LsvDTtzm3vyBEO7RPptvAD+t44WVXaUjTBRcrpFeFlC8WCruUR456hw==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/metro-symbolicate": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.1.tgz",
-      "integrity": "sha512-Lgk0qjEigtFtsM7C0miXITbcV47E1ZYIfB+m/hCraihiwRWkNUQEPCWvqZmwXKSwVE5mXA0EzQtghAvQSjZDxw==",
-      "dependencies": {
-        "flow-enums-runtime": "^0.0.6",
-        "invariant": "^2.2.4",
-        "metro-source-map": "0.81.1",
-        "nullthrows": "^1.1.1",
-        "source-map": "^0.5.6",
-        "vlq": "^1.0.0"
-      },
-      "bin": {
-        "metro-symbolicate": "src/index.js"
-      },
+    "node_modules/kleur": {
+      "version": "3.0.3",
+      "resolved": "https://registry.npmjs.org/kleur/-/kleur-3.0.3.tgz",
+      "integrity": "sha512-eTIzlVOSUR+JxdDFepEYcBMtZ9Qqdef+rnzWdRZuMbOywu5tO2w2N7rqjoANZ5k9vywhL6Br1VRjUIgTQx4E8w==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">=6"
       }
     },
-    "node_modules/metro-transform-plugins": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.81.1.tgz",
-      "integrity": "sha512-7L1lI44/CyjIoBaORhY9fVkoNe8hrzgxjSCQ/lQlcfrV31cZb7u0RGOQrKmUX7Bw4FpejrB70ArQ7Mse9mk7+Q==",
-      "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/template": "^7.25.0",
-        "@babel/traverse": "^7.25.3",
-        "flow-enums-runtime": "^0.0.6",
-        "nullthrows": "^1.1.1"
-      },
+    "node_modules/leven": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/leven/-/leven-3.1.0.tgz",
+      "integrity": "sha512-qsda+H8jTaUaN/x5vzW2rzc+8Rw4TAQ/4KjB46IwK5VH+IlVeeeje/EoZRpiXvIqjFgK84QffqPztGI3VBLG1A==",
       "engines": {
-        "node": ">=18.18"
+        "node": ">=6"
       }
     },
-    "node_modules/metro-transform-worker": {
-      "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.81.1.tgz",
-      "integrity": "sha512-M+2hVT3rEy5K7PBmGDgQNq3Zx53TjScOcO/CieyLnCRFtBGWZiSJ2+bLAXXOKyKa/y3bI3i0owxtyxuPGDwbZg==",
+    "node_modules/levn": {
+      "version": "0.4.1",
+      "resolved": "https://registry.npmjs.org/levn/-/levn-0.4.1.tgz",
+      "integrity": "sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==",
+      "dev": true,
       "dependencies": {
-        "@babel/core": "^7.25.2",
-        "@babel/generator": "^7.25.0",
-        "@babel/parser": "^7.25.3",
-        "@babel/types": "^7.25.2",
-        "flow-enums-runtime": "^0.0.6",
-        "metro": "0.81.1",
-        "metro-babel-transformer": "0.81.1",
-        "metro-cache": "0.81.1",
-        "metro-cache-key": "0.81.1",
-        "metro-minify-terser": "0.81.1",
-        "metro-source-map": "0.81.1",
-        "metro-transform-plugins": "0.81.1",
-        "nullthrows": "^1.1.1"
+        "prelude-ls": "^1.2.1",
+        "type-check": "~0.4.0"
       },
       "engines": {
-        "node": ">=18.18"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/metro/node_modules/ci-info": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
-      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    "node_modules/lighthouse-logger": {
+      "version": "1.4.2",
+      "resolved": "https://registry.npmjs.org/lighthouse-logger/-/lighthouse-logger-1.4.2.tgz",
+      "integrity": "sha512-gPWxznF6TKmUHrOQjlVo2UbaL2EJ71mb2CCeRs/2qBpi4L/g4LUVc9+3lKQ6DTUZwJswfM7ainGrLO1+fOqa2g==",
+      "dependencies": {
+        "debug": "^2.6.9",
+        "marky": "^1.2.2"
+      }
     },
-    "node_modules/metro/node_modules/debug": {
+    "node_modules/lighthouse-logger/node_modules/debug": {
       "version": "2.6.9",
       "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
       "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
@@ -16465,2012 +11647,2093 @@
         "ms": "2.0.0"
       }
     },
-    "node_modules/metro/node_modules/hermes-estree": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
-      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
-    },
-    "node_modules/metro/node_modules/hermes-parser": {
-      "version": "0.25.1",
-      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
-      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
-      "dependencies": {
-        "hermes-estree": "0.25.1"
-      }
-    },
-    "node_modules/metro/node_modules/ms": {
+    "node_modules/lighthouse-logger/node_modules/ms": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
       "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
     },
-    "node_modules/metro/node_modules/ws": {
-      "version": "7.5.10",
-      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
-      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
+    "node_modules/lightningcss": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss/-/lightningcss-1.27.0.tgz",
+      "integrity": "sha512-8f7aNmS1+etYSLHht0fQApPc2kNO8qGRutifN5rVIc6Xo6ABsEbqOr758UwI7ALVbTt4x1fllKt0PYgzD9S3yQ==",
+      "dependencies": {
+        "detect-libc": "^1.0.3"
+      },
       "engines": {
-        "node": ">=8.3.0"
+        "node": ">= 12.0.0"
       },
-      "peerDependencies": {
-        "bufferutil": "^4.0.1",
-        "utf-8-validate": "^5.0.2"
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       },
-      "peerDependenciesMeta": {
-        "bufferutil": {
-          "optional": true
-        },
-        "utf-8-validate": {
-          "optional": true
-        }
+      "optionalDependencies": {
+        "lightningcss-darwin-arm64": "1.27.0",
+        "lightningcss-darwin-x64": "1.27.0",
+        "lightningcss-freebsd-x64": "1.27.0",
+        "lightningcss-linux-arm-gnueabihf": "1.27.0",
+        "lightningcss-linux-arm64-gnu": "1.27.0",
+        "lightningcss-linux-arm64-musl": "1.27.0",
+        "lightningcss-linux-x64-gnu": "1.27.0",
+        "lightningcss-linux-x64-musl": "1.27.0",
+        "lightningcss-win32-arm64-msvc": "1.27.0",
+        "lightningcss-win32-x64-msvc": "1.27.0"
       }
     },
-    "node_modules/micromatch": {
-      "version": "4.0.8",
-      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
-      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
-      "dependencies": {
-        "braces": "^3.0.3",
-        "picomatch": "^2.3.1"
+    "node_modules/lightningcss-darwin-arm64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-arm64/-/lightningcss-darwin-arm64-1.27.0.tgz",
+      "integrity": "sha512-Gl/lqIXY+d+ySmMbgDf0pgaWSqrWYxVHoc88q+Vhf2YNzZ8DwoRzGt5NZDVqqIW5ScpSnmmjcgXP87Dn2ylSSQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-darwin-x64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-darwin-x64/-/lightningcss-darwin-x64-1.27.0.tgz",
+      "integrity": "sha512-0+mZa54IlcNAoQS9E0+niovhyjjQWEMrwW0p2sSdLRhLDc8LMQ/b67z7+B5q4VmjYCMSfnFi3djAAQFIDuj/Tg==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "darwin"
+      ],
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/micromatch/node_modules/picomatch": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
-      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
+    "node_modules/lightningcss-freebsd-x64": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-freebsd-x64/-/lightningcss-freebsd-x64-1.27.0.tgz",
+      "integrity": "sha512-n1sEf85fePoU2aDN2PzYjoI8gbBqnmLGEhKq7q0DKLj0UTVmOTwDC7PtLcy/zFxzASTSBlVQYJUhwIStQMIpRA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "freebsd"
+      ],
       "engines": {
-        "node": ">=8.6"
+        "node": ">= 12.0.0"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/mime": {
-      "version": "1.6.0",
-      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
-      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
-      "bin": {
-        "mime": "cli.js"
+    "node_modules/lightningcss-linux-arm-gnueabihf": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm-gnueabihf/-/lightningcss-linux-arm-gnueabihf-1.27.0.tgz",
+      "integrity": "sha512-MUMRmtdRkOkd5z3h986HOuNBD1c2lq2BSQA1Jg88d9I7bmPGx08bwGcnB75dvr17CwxjxD6XPi3Qh8ArmKFqCA==",
+      "cpu": [
+        "arm"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-arm64-gnu": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-gnu/-/lightningcss-linux-arm64-gnu-1.27.0.tgz",
+      "integrity": "sha512-cPsxo1QEWq2sfKkSq2Bq5feQDHdUEwgtA9KaB27J5AX22+l4l0ptgjMZZtYtUnteBofjee+0oW1wQ1guv04a7A==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">=4"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/mime-db": {
-      "version": "1.53.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
-      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+    "node_modules/lightningcss-linux-arm64-musl": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-arm64-musl/-/lightningcss-linux-arm64-musl-1.27.0.tgz",
+      "integrity": "sha512-rCGBm2ax7kQ9pBSeITfCW9XSVF69VX+fm5DIpvDZQl4NnQoMQyRwhZQm9pd59m8leZ1IesRqWk2v/DntMo26lg==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/mime-types": {
-      "version": "2.1.35",
-      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
-      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
-      "dependencies": {
-        "mime-db": "1.52.0"
+    "node_modules/lightningcss-linux-x64-gnu": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-gnu/-/lightningcss-linux-x64-gnu-1.27.0.tgz",
+      "integrity": "sha512-Dk/jovSI7qqhJDiUibvaikNKI2x6kWPN79AQiD/E/KeQWMjdGe9kw51RAgoWFDi0coP4jinaH14Nrt/J8z3U4A==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-linux-x64-musl": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-linux-x64-musl/-/lightningcss-linux-x64-musl-1.27.0.tgz",
+      "integrity": "sha512-QKjTxXm8A9s6v9Tg3Fk0gscCQA1t/HMoF7Woy1u68wCk5kS4fR+q3vXa1p3++REW784cRAtkYKrPy6JKibrEZA==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "linux"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-arm64-msvc": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-arm64-msvc/-/lightningcss-win32-arm64-msvc-1.27.0.tgz",
+      "integrity": "sha512-/wXegPS1hnhkeG4OXQKEMQeJd48RDC3qdh+OA8pCuOPCyvnm/yEayrJdJVqzBsqpy1aJklRCVxscpFur80o6iQ==",
+      "cpu": [
+        "arm64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
+      "engines": {
+        "node": ">= 12.0.0"
       },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
+      }
+    },
+    "node_modules/lightningcss-win32-x64-msvc": {
+      "version": "1.27.0",
+      "resolved": "https://registry.npmjs.org/lightningcss-win32-x64-msvc/-/lightningcss-win32-x64-msvc-1.27.0.tgz",
+      "integrity": "sha512-/OJLj94Zm/waZShL8nB5jsNj3CfNATLCTyFxZyouilfTmSoLDX7VlVAmhPHoZWVFp4vdmoiEbPEYC8HID3m6yw==",
+      "cpu": [
+        "x64"
+      ],
+      "optional": true,
+      "os": [
+        "win32"
+      ],
       "engines": {
-        "node": ">= 0.6"
+        "node": ">= 12.0.0"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/parcel"
       }
     },
-    "node_modules/mime-types/node_modules/mime-db": {
-      "version": "1.52.0",
-      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
-      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
+    "node_modules/lilconfig": {
+      "version": "3.1.3",
+      "resolved": "https://registry.npmjs.org/lilconfig/-/lilconfig-3.1.3.tgz",
+      "integrity": "sha512-/vlFKAoH5Cgt3Ie+JLhRbwOsCQePABiU3tJ1egGvyQ+33R/vcwM2Zl2QR/LzjsBeItPt3oSVXapn+m4nQDvpzw==",
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=14"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/antonk52"
       }
     },
-    "node_modules/mimic-fn": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
-      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
-      "engines": {
-        "node": ">=4"
-      }
+    "node_modules/lines-and-columns": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/lines-and-columns/-/lines-and-columns-1.2.4.tgz",
+      "integrity": "sha512-7ylylesZQ/PV29jhEDl3Ufjo6ZX7gCqJr5F7PKrqc93v7fzSymt1BpwEU8nAUXs8qzzvqhbjhK5QZg6Mt/HkBg=="
     },
-    "node_modules/min-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
-      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
+    "node_modules/loader-runner": {
+      "version": "4.3.0",
+      "resolved": "https://registry.npmjs.org/loader-runner/-/loader-runner-4.3.0.tgz",
+      "integrity": "sha512-3R/1M+yS3j5ou80Me59j7F9IMs4PXs3VqRrm0TU3AbKPxlmpoY1TNscJV/oGJXo8qCatFGTfDbY6W6ipGOYXfg==",
+      "peer": true,
       "engines": {
-        "node": ">=4"
+        "node": ">=6.11.5"
       }
     },
-    "node_modules/mini-css-extract-plugin": {
-      "version": "2.9.2",
-      "resolved": "https://registry.npmjs.org/mini-css-extract-plugin/-/mini-css-extract-plugin-2.9.2.tgz",
-      "integrity": "sha512-GJuACcS//jtq4kCtd5ii/M0SZf7OZRH+BxdqXZHaJfb8TJiVl+NgQRPwiYt2EuqeSkNydn/7vP+bcE27C5mb9w==",
+    "node_modules/locate-path": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-6.0.0.tgz",
+      "integrity": "sha512-iPZK6eYjbxRu3uB4/WZ3EsEIMJFMqAoopl3R+zuq0UjcAm/MO6KCweDgPfP3elTztoKP3KtnVHxTn2NHBSDVUw==",
       "dependencies": {
-        "schema-utils": "^4.0.0",
-        "tapable": "^2.2.1"
+        "p-locate": "^5.0.0"
       },
       "engines": {
-        "node": ">= 12.13.0"
+        "node": ">=10"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/minimalistic-assert": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
-      "integrity": "sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A=="
+    "node_modules/lodash": {
+      "version": "4.17.21",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.21.tgz",
+      "integrity": "sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg=="
     },
-    "node_modules/minimatch": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
-      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
-      "dependencies": {
-        "brace-expansion": "^1.1.7"
-      },
-      "engines": {
-        "node": "*"
-      }
+    "node_modules/lodash.debounce": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/lodash.debounce/-/lodash.debounce-4.0.8.tgz",
+      "integrity": "sha512-FT1yDzDYEoYWhnSGnpE/4Kj1fLZkDFyqRb7fNt6FdYOSxlUWAtp42Eh6Wb0rGIv/m9Bgo7x4GhQbm5Ys4SG5ow=="
     },
-    "node_modules/minimist": {
-      "version": "1.2.8",
-      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
-      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
+    "node_modules/lodash.merge": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.merge/-/lodash.merge-4.6.2.tgz",
+      "integrity": "sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==",
+      "dev": true
     },
-    "node_modules/minipass": {
-      "version": "7.1.2",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
-      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
-      "engines": {
-        "node": ">=16 || 14 >=14.17"
-      }
+    "node_modules/lodash.mergewith": {
+      "version": "4.6.2",
+      "resolved": "https://registry.npmjs.org/lodash.mergewith/-/lodash.mergewith-4.6.2.tgz",
+      "integrity": "sha512-GK3g5RPZWTRSeLSpgP8Xhra+pnjBC56q9FZYe1d5RN3TJ35dbkGy3YqBSMbyCrlbi+CM9Z3Jk5yTL7RCsqboyQ=="
     },
-    "node_modules/minipass-collect": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
-      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
+    "node_modules/lodash.throttle": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/lodash.throttle/-/lodash.throttle-4.1.1.tgz",
+      "integrity": "sha512-wIkUCfVKpVsWo3JSZlc+8MB5it+2AN5W8J7YVMST30UrvcQNZ1Okbj+rbVniijTWE6FGYy4XJq/rHkas8qJMLQ=="
+    },
+    "node_modules/log-symbols": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/log-symbols/-/log-symbols-2.2.0.tgz",
+      "integrity": "sha512-VeIAFslyIerEJLXHziedo2basKbMKtTw3vfn5IzG0XTjhAVEJyNHnL2p7vc+wBDSdQuUpNw3M2u6xb9QsAY5Eg==",
       "dependencies": {
-        "minipass": "^7.0.3"
+        "chalk": "^2.0.1"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.17"
+        "node": ">=4"
       }
     },
-    "node_modules/minipass-flush": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
-      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+    "node_modules/log-symbols/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "minipass": "^3.0.0"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
-    "node_modules/minipass-flush/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/log-symbols/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/minipass-flush/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/minipass-pipeline": {
-      "version": "1.2.4",
-      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
-      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+    "node_modules/log-symbols/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
       "dependencies": {
-        "minipass": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
+        "color-name": "1.1.3"
       }
     },
-    "node_modules/minipass-pipeline/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
-      "dependencies": {
-        "yallist": "^4.0.0"
-      },
+    "node_modules/log-symbols/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/log-symbols/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
       "engines": {
-        "node": ">=8"
+        "node": ">=0.8.0"
       }
     },
-    "node_modules/minipass-pipeline/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/minizlib": {
-      "version": "2.1.2",
-      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
-      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
-      "dependencies": {
-        "minipass": "^3.0.0",
-        "yallist": "^4.0.0"
-      },
+    "node_modules/log-symbols/node_modules/has-flag": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
-        "node": ">= 8"
+        "node": ">=4"
       }
     },
-    "node_modules/minizlib/node_modules/minipass": {
-      "version": "3.3.6",
-      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
-      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+    "node_modules/log-symbols/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "yallist": "^4.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=4"
       }
     },
-    "node_modules/minizlib/node_modules/yallist": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
-      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
-    },
-    "node_modules/mkdirp": {
-      "version": "0.5.6",
-      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
-      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+    "node_modules/loose-envify": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/loose-envify/-/loose-envify-1.4.0.tgz",
+      "integrity": "sha512-lyuxPGr/Wfhrlem2CL/UcnUc1zcqKAImBDzukY7Y5F/yQiNdko6+fRLevlw1HgMySw7f611UIY408EtxRSoK3Q==",
       "dependencies": {
-        "minimist": "^1.2.6"
+        "js-tokens": "^3.0.0 || ^4.0.0"
       },
       "bin": {
-        "mkdirp": "bin/cmd.js"
+        "loose-envify": "cli.js"
       }
     },
-    "node_modules/moment": {
-      "version": "2.30.1",
-      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
-      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+    "node_modules/lower-case": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/lower-case/-/lower-case-2.0.2.tgz",
+      "integrity": "sha512-7fm3l3NAF9WfN6W3JOmf5drwpVqX78JtoGJ3A6W0a6ZnldM41w2fV5D490psKFTpMds8TJse/eHLFFsNHHjHgg==",
+      "dev": true,
       "license": "MIT",
-      "optional": true,
-      "engines": {
-        "node": "*"
-      }
-    },
-    "node_modules/ms": {
-      "version": "2.1.3",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
-      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
-    },
-    "node_modules/multicast-dns": {
-      "version": "7.2.5",
-      "resolved": "https://registry.npmjs.org/multicast-dns/-/multicast-dns-7.2.5.tgz",
-      "integrity": "sha512-2eznPJP8z2BFLX50tf0LuODrpINqP1RVIm/CObbTcBRITQgmC/TjcREF1NeTBzIcR5XO/ukWo+YHOjBbFwIupg==",
       "dependencies": {
-        "dns-packet": "^5.2.2",
-        "thunky": "^1.0.2"
-      },
-      "bin": {
-        "multicast-dns": "cli.js"
+        "tslib": "^2.0.3"
       }
-    },
-    "node_modules/mv": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/mv/-/mv-2.1.1.tgz",
-      "integrity": "sha512-at/ZndSy3xEGJ8i0ygALh8ru9qy7gWW1cmkaqBN29JmMlIvM//MEO9y1sk/avxuwnPcfhkejkLsuPxH81BrkSg==",
-      "optional": true,
-      "peer": true,
+    },
+    "node_modules/lru-cache": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
+      "integrity": "sha512-KpNARQA3Iwv+jTA0utUVVbrh+Jlrr1Fv0e56GGzAFOXN7dk/FviaDW8LHmK52DlcH4WP2n6gI8vN1aesBFgo9w==",
       "dependencies": {
-        "mkdirp": "~0.5.1",
-        "ncp": "~2.0.0",
-        "rimraf": "~2.4.0"
-      },
-      "engines": {
-        "node": ">=0.8.0"
+        "yallist": "^3.0.2"
       }
     },
-    "node_modules/mv/node_modules/glob": {
-      "version": "6.0.4",
-      "resolved": "https://registry.npmjs.org/glob/-/glob-6.0.4.tgz",
-      "integrity": "sha512-MKZeRNyYZAVVVG1oZeLaWie1uweH40m9AZwIwxyPbTSX4hHrVYSzLg0Ro5Z5R7XKkIX+Cc6oD1rqeDJnwsB8/A==",
-      "deprecated": "Glob versions prior to v9 are no longer supported",
-      "optional": true,
-      "peer": true,
+    "node_modules/make-dir": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/make-dir/-/make-dir-2.1.0.tgz",
+      "integrity": "sha512-LS9X+dc8KLxXCb8dni79fLIIUA5VyZoyjSMCwTluaXA0o27cCK0bhXkpgw+sTXVpPy/lSO57ilRixqk0vDmtRA==",
       "dependencies": {
-        "inflight": "^1.0.4",
-        "inherits": "2",
-        "minimatch": "2 || 3",
-        "once": "^1.3.0",
-        "path-is-absolute": "^1.0.0"
+        "pify": "^4.0.1",
+        "semver": "^5.6.0"
       },
       "engines": {
-        "node": "*"
+        "node": ">=6"
       }
     },
-    "node_modules/mv/node_modules/rimraf": {
-      "version": "2.4.5",
-      "resolved": "https://registry.npmjs.org/rimraf/-/rimraf-2.4.5.tgz",
-      "integrity": "sha512-J5xnxTyqaiw06JjMftq7L9ouA448dw/E7dKghkP9WpKNuwmARNNg+Gk8/u5ryb9N/Yo2+z3MCwuqFK/+qPOPfQ==",
-      "deprecated": "Rimraf versions prior to v4 are no longer supported",
-      "optional": true,
-      "peer": true,
-      "dependencies": {
-        "glob": "^6.0.1"
-      },
+    "node_modules/make-dir/node_modules/semver": {
+      "version": "5.7.2",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-5.7.2.tgz",
+      "integrity": "sha512-cBznnQ9KjJqU67B52RMC65CMarK2600WFnbkcaiwWq3xy/5haFJlshgnpjovMVJ+Hff49d8GEn0b87C5pDQ10g==",
       "bin": {
-        "rimraf": "bin.js"
+        "semver": "bin/semver"
       }
     },
-    "node_modules/mz": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
-      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
+    "node_modules/makeerror": {
+      "version": "1.0.12",
+      "resolved": "https://registry.npmjs.org/makeerror/-/makeerror-1.0.12.tgz",
+      "integrity": "sha512-JmqCvUhmt43madlpFzG4BQzG2Z3m6tvQDNKdClZnO3VbIudJYmxsT0FNJMeiB2+JTSlTQTSbU8QdesVmwJcmLg==",
       "dependencies": {
-        "any-promise": "^1.0.0",
-        "object-assign": "^4.0.1",
-        "thenify-all": "^1.0.0"
+        "tmpl": "1.0.5"
       }
     },
-    "node_modules/nanoid": {
-      "version": "3.3.8",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
-      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
-      "funding": [
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "bin": {
-        "nanoid": "bin/nanoid.cjs"
-      },
+    "node_modules/marky": {
+      "version": "1.2.5",
+      "resolved": "https://registry.npmjs.org/marky/-/marky-1.2.5.tgz",
+      "integrity": "sha512-q9JtQJKjpsVxCRVgQ+WapguSbKC3SQ5HEzFGPAJMStgh3QjCawp00UKv3MTTAArTmGmmPUvllHZoNbZ3gs0I+Q=="
+    },
+    "node_modules/math-intrinsics": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/math-intrinsics/-/math-intrinsics-1.1.0.tgz",
+      "integrity": "sha512-/IXtbwEk5HTPyEwyKX6hGkYXxM9nbj64B+ilVJnC/R6B0pH5G4V3b0pVbL7DBj4tkhBAppbQUlf6F6Xl9LHu1g==",
       "engines": {
-        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/nativewind": {
-      "version": "4.0.36",
-      "resolved": "https://registry.npmjs.org/nativewind/-/nativewind-4.0.36.tgz",
-      "integrity": "sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==",
-      "license": "MIT",
+    "node_modules/md5": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/md5/-/md5-2.3.0.tgz",
+      "integrity": "sha512-T1GITYmFaKuO91vxyoQMFETst+O71VUPEU3ze5GNzDm0OWdP8v1ziTaAEPUr/3kLsY3Sftgz242A1SetQiDL7g==",
       "dependencies": {
-        "react-native-css-interop": "0.0.36"
-      },
-      "engines": {
-        "node": ">=16"
-      },
-      "peerDependencies": {
-        "tailwindcss": ">3.3.0"
+        "charenc": "0.0.2",
+        "crypt": "0.0.2",
+        "is-buffer": "~1.1.6"
       }
     },
-    "node_modules/natural-compare": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
-      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
-    },
-    "node_modules/ncp": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ncp/-/ncp-2.0.0.tgz",
-      "integrity": "sha512-zIdGUrPRFTUELUvr3Gmc7KZ2Sw/h1PiVM0Af/oHB6zgnV1ikqSfRk+TOufi79aHYCW3NiOXmr1BP5nWbzojLaA==",
-      "optional": true,
-      "peer": true,
+    "node_modules/md5-file": {
+      "version": "3.2.3",
+      "resolved": "https://registry.npmjs.org/md5-file/-/md5-file-3.2.3.tgz",
+      "integrity": "sha512-3Tkp1piAHaworfcCgH0jKbTvj1jWWFgbvh2cXaNCgHwyTCBxxvD1Y04rmfpvdPm1P4oXMOpm6+2H7sr7v9v8Fw==",
+      "dependencies": {
+        "buffer-alloc": "^1.1.0"
+      },
       "bin": {
-        "ncp": "bin/ncp"
-      }
-    },
-    "node_modules/negotiator": {
-      "version": "0.6.3",
-      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
-      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
+        "md5-file": "cli.js"
+      },
       "engines": {
-        "node": ">= 0.6"
+        "node": ">=0.10"
       }
     },
-    "node_modules/neo-async": {
-      "version": "2.6.2",
-      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
-      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    "node_modules/mdn-data": {
+      "version": "2.0.14",
+      "resolved": "https://registry.npmjs.org/mdn-data/-/mdn-data-2.0.14.tgz",
+      "integrity": "sha512-dn6wd0uw5GsdswPFfsgMp5NSB0/aDe6fK94YJV/AJDYXL6HVLWBsxeq7js7Ad+mU2K9LAlwpk6kN2D5mwCPVow=="
     },
-    "node_modules/nested-error-stacks": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz",
-      "integrity": "sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="
+    "node_modules/memoize-one": {
+      "version": "5.2.1",
+      "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-5.2.1.tgz",
+      "integrity": "sha512-zYiwtZUcYyXKo/np96AGZAckk+FWWsUdJ3cHGGmld7+AhvcWmQyGCYUh1hc4Q/pkOhb65dQR/pqCyK0cOaHz4Q=="
     },
-    "node_modules/nice-try": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
-      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    "node_modules/merge-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/merge-stream/-/merge-stream-2.0.0.tgz",
+      "integrity": "sha512-abv/qOcuPfk3URPfDzmZU1LKmuw8kT+0nIHvKrKgFrwifol/doWcdA4ZqsWQ8ENrFKkd67Mfpo/LovbIUsbt3w=="
     },
-    "node_modules/no-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
-      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
-      "license": "MIT",
-      "dependencies": {
-        "lower-case": "^2.0.2",
-        "tslib": "^2.0.3"
+    "node_modules/merge2": {
+      "version": "1.4.1",
+      "resolved": "https://registry.npmjs.org/merge2/-/merge2-1.4.1.tgz",
+      "integrity": "sha512-8q7VEgMJW4J8tcfVPy8g09NcQwZdbwFEqhe/WZkoIzjn/3TGDwtOCYtXGxA3O8tPzpczCCDgv+P2P5y00ZJOOg==",
+      "engines": {
+        "node": ">= 8"
       }
     },
-    "node_modules/node-dir": {
-      "version": "0.1.17",
-      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
-      "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
+    "node_modules/metro": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro/-/metro-0.81.1.tgz",
+      "integrity": "sha512-fqRu4fg8ONW7VfqWFMGgKAcOuMzyoQah2azv9Y3VyFXAmG+AoTU6YIFWqAADESCGVWuWEIvxTJhMf3jxU6jwjA==",
       "dependencies": {
-        "minimatch": "^3.0.2"
+        "@babel/code-frame": "^7.24.7",
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "accepts": "^1.3.7",
+        "chalk": "^4.0.0",
+        "ci-info": "^2.0.0",
+        "connect": "^3.6.5",
+        "debug": "^2.2.0",
+        "error-stack-parser": "^2.0.6",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "hermes-parser": "0.25.1",
+        "image-size": "^1.0.2",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "jsc-safe-url": "^0.2.2",
+        "lodash.throttle": "^4.1.1",
+        "metro-babel-transformer": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-cache-key": "0.81.1",
+        "metro-config": "0.81.1",
+        "metro-core": "0.81.1",
+        "metro-file-map": "0.81.1",
+        "metro-resolver": "0.81.1",
+        "metro-runtime": "0.81.1",
+        "metro-source-map": "0.81.1",
+        "metro-symbolicate": "0.81.1",
+        "metro-transform-plugins": "0.81.1",
+        "metro-transform-worker": "0.81.1",
+        "mime-types": "^2.1.27",
+        "nullthrows": "^1.1.1",
+        "serialize-error": "^2.1.0",
+        "source-map": "^0.5.6",
+        "throat": "^5.0.0",
+        "ws": "^7.5.10",
+        "yargs": "^17.6.2"
+      },
+      "bin": {
+        "metro": "src/cli.js"
       },
       "engines": {
-        "node": ">= 0.10.5"
+        "node": ">=18.18"
       }
     },
-    "node_modules/node-fetch": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
-      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
+    "node_modules/metro-babel-transformer": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-babel-transformer/-/metro-babel-transformer-0.81.1.tgz",
+      "integrity": "sha512-JECKDrQaUnDmj0x/Q/c8c5YwsatVx38Lu+BfCwX9fR8bWipAzkvJocBpq5rOAJRDXRgDcPv2VO4Q4nFYrpYNQg==",
       "dependencies": {
-        "whatwg-url": "^5.0.0"
-      },
-      "engines": {
-        "node": "4.x || >=6.0.0"
-      },
-      "peerDependencies": {
-        "encoding": "^0.1.0"
+        "@babel/core": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "hermes-parser": "0.25.1",
+        "nullthrows": "^1.1.1"
       },
-      "peerDependenciesMeta": {
-        "encoding": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/node-forge": {
-      "version": "1.3.1",
-      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
-      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
-        "node": ">= 6.13.0"
+        "node": ">=18.18"
       }
     },
-    "node_modules/node-html-parser": {
-      "version": "5.4.2",
-      "resolved": "https://registry.npmjs.org/node-html-parser/-/node-html-parser-5.4.2.tgz",
-      "integrity": "sha512-RaBPP3+51hPne/OolXxcz89iYvQvKOydaqoePpOgXcrOKZhjVIzmpKZz+Hd/RBO2/zN2q6CNJhQzucVz+u3Jyw==",
-      "dependencies": {
-        "css-select": "^4.2.1",
-        "he": "1.2.0"
-      }
+    "node_modules/metro-babel-transformer/node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
     },
-    "node_modules/node-html-parser/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
+    "node_modules/metro-babel-transformer/node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
       "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
+        "hermes-estree": "0.25.1"
       }
     },
-    "node_modules/node-html-parser/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
+    "node_modules/metro-cache": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-cache/-/metro-cache-0.81.1.tgz",
+      "integrity": "sha512-Uqcmn6sZ+Y0VJHM88VrG5xCvSeU7RnuvmjPmSOpEcyJJBe02QkfHL05MX2ZyGDTyZdbKCzaX0IijrTe4hN3F0Q==",
       "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
+        "exponential-backoff": "^3.1.1",
+        "flow-enums-runtime": "^0.0.6",
+        "metro-core": "0.81.1"
       },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
+      "engines": {
+        "node": ">=18.18"
       }
     },
-    "node_modules/node-html-parser/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
+    "node_modules/metro-cache-key": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-cache-key/-/metro-cache-key-0.81.1.tgz",
+      "integrity": "sha512-5fDaHR1yTvpaQuwMAeEoZGsVyvjrkw9IFAS7WixSPvaNY5YfleqoJICPc6hbXFJjvwCCpwmIYFkjqzR/qJ6yqA==",
       "dependencies": {
-        "domelementtype": "^2.2.0"
+        "flow-enums-runtime": "^0.0.6"
       },
       "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
+        "node": ">=18.18"
       }
     },
-    "node_modules/node-html-parser/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
+    "node_modules/metro-config": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-config/-/metro-config-0.81.1.tgz",
+      "integrity": "sha512-VAAJmxsKIZ+Fz5/z1LVgxa32gE6+2TvrDSSx45g85WoX4EtLmdBGP3DSlpQW3DqFUfNHJCGwMLGXpJnxifd08g==",
       "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
+        "connect": "^3.6.5",
+        "cosmiconfig": "^5.0.5",
+        "flow-enums-runtime": "^0.0.6",
+        "jest-validate": "^29.6.3",
+        "metro": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-core": "0.81.1",
+        "metro-runtime": "0.81.1"
       },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/node-html-parser/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/node-int64": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
-      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
-    },
-    "node_modules/node-releases": {
-      "version": "2.0.19",
-      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
-      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
-    },
-    "node_modules/normalize-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
-      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18.18"
       }
     },
-    "node_modules/normalize-url": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-6.1.0.tgz",
-      "integrity": "sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==",
-      "engines": {
-        "node": ">=10"
+    "node_modules/metro-core": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-core/-/metro-core-0.81.1.tgz",
+      "integrity": "sha512-4d2/+02IYqOwJs4dmM0dC8hIZqTzgnx2nzN4GTCaXb3Dhtmi/SJ3v6744zZRnithhN4lxf8TTJSHnQV75M7SSA==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6",
+        "lodash.throttle": "^4.1.1",
+        "metro-resolver": "0.81.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+      "engines": {
+        "node": ">=18.18"
       }
     },
-    "node_modules/npm-package-arg": {
-      "version": "11.0.3",
-      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
-      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
+    "node_modules/metro-file-map": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-file-map/-/metro-file-map-0.81.1.tgz",
+      "integrity": "sha512-aY72H2ujmRfFxcsbyh83JgqFF+uQ4HFN1VhV2FmcfQG4s1bGKf2Vbkk+vtZ1+EswcBwDZFbkpvAjN49oqwGzAA==",
       "dependencies": {
-        "hosted-git-info": "^7.0.0",
-        "proc-log": "^4.0.0",
-        "semver": "^7.3.5",
-        "validate-npm-package-name": "^5.0.0"
+        "debug": "^2.2.0",
+        "fb-watchman": "^2.0.0",
+        "flow-enums-runtime": "^0.0.6",
+        "graceful-fs": "^4.2.4",
+        "invariant": "^2.2.4",
+        "jest-worker": "^29.6.3",
+        "micromatch": "^4.0.4",
+        "nullthrows": "^1.1.1",
+        "walker": "^1.0.7"
       },
       "engines": {
-        "node": "^16.14.0 || >=18.0.0"
+        "node": ">=18.18"
       }
     },
-    "node_modules/npm-package-arg/node_modules/semver": {
-      "version": "7.7.1",
-      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
-      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
-      "bin": {
-        "semver": "bin/semver.js"
-      },
-      "engines": {
-        "node": ">=10"
+    "node_modules/metro-file-map/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/npm-run-path": {
-      "version": "2.0.2",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
-      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
+    "node_modules/metro-file-map/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/metro-minify-terser": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-minify-terser/-/metro-minify-terser-0.81.1.tgz",
+      "integrity": "sha512-p/Qz3NNh1nebSqMlxlUALAnESo6heQrnvgHtAuxufRPtKvghnVDq9hGGex8H7z7YYLsqe42PWdt4JxTA3mgkvg==",
       "dependencies": {
-        "path-key": "^2.0.0"
+        "flow-enums-runtime": "^0.0.6",
+        "terser": "^5.15.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=18.18"
       }
     },
-    "node_modules/npm-run-path/node_modules/path-key": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
-      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
+    "node_modules/metro-resolver": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-resolver/-/metro-resolver-0.81.1.tgz",
+      "integrity": "sha512-E61t6fxRoYRkl6Zo3iUfCKW4DYfum/bLjcejXBMt1y3I7LFkK84TCR/Rs9OAwsMCY/7GOPB4+CREYZOtCC7CNA==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=18.18"
       }
     },
-    "node_modules/nth-check": {
-      "version": "2.1.1",
-      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
-      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
+    "node_modules/metro-runtime": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-runtime/-/metro-runtime-0.81.1.tgz",
+      "integrity": "sha512-pqu5j5d01rjF85V/K8SDDJ0NR3dRp6bE3z5bKVVb5O2Rx0nbR9KreUxYALQCRCcQHaYySqCg5fYbGKBHC295YQ==",
       "dependencies": {
-        "boolbase": "^1.0.0"
+        "@babel/runtime": "^7.25.0",
+        "flow-enums-runtime": "^0.0.6"
       },
-      "funding": {
-        "url": "https://github.com/fb55/nth-check?sponsor=1"
+      "engines": {
+        "node": ">=18.18"
       }
     },
-    "node_modules/nullthrows": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
-      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
-    },
-    "node_modules/nwsapi": {
-      "version": "2.2.16",
-      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
-      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ=="
-    },
-    "node_modules/ob1": {
+    "node_modules/metro-source-map": {
       "version": "0.81.1",
-      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.81.1.tgz",
-      "integrity": "sha512-1PEbvI+AFvOcgdNcO79FtDI1TUO8S3lhiKOyAiyWQF3sFDDKS+aw2/BZvGlArFnSmqckwOOB9chQuIX0/OahoQ==",
+      "resolved": "https://registry.npmjs.org/metro-source-map/-/metro-source-map-0.81.1.tgz",
+      "integrity": "sha512-1i8ROpNNiga43F0ZixAXoFE/SS3RqcRDCCslpynb+ytym0VI7pkTH1woAN2HI9pczYtPrp3Nq0AjRpsuY35ieA==",
       "dependencies": {
-        "flow-enums-runtime": "^0.0.6"
+        "@babel/traverse": "^7.25.3",
+        "@babel/traverse--for-generate-function-map": "npm:@babel/traverse@^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-symbolicate": "0.81.1",
+        "nullthrows": "^1.1.1",
+        "ob1": "0.81.1",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
       },
       "engines": {
         "node": ">=18.18"
       }
     },
-    "node_modules/object-assign": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
-      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
+    "node_modules/metro-symbolicate": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-symbolicate/-/metro-symbolicate-0.81.1.tgz",
+      "integrity": "sha512-Lgk0qjEigtFtsM7C0miXITbcV47E1ZYIfB+m/hCraihiwRWkNUQEPCWvqZmwXKSwVE5mXA0EzQtghAvQSjZDxw==",
+      "dependencies": {
+        "flow-enums-runtime": "^0.0.6",
+        "invariant": "^2.2.4",
+        "metro-source-map": "0.81.1",
+        "nullthrows": "^1.1.1",
+        "source-map": "^0.5.6",
+        "vlq": "^1.0.0"
+      },
+      "bin": {
+        "metro-symbolicate": "src/index.js"
+      },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=18.18"
       }
     },
-    "node_modules/object-hash": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
-      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+    "node_modules/metro-transform-plugins": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-transform-plugins/-/metro-transform-plugins-0.81.1.tgz",
+      "integrity": "sha512-7L1lI44/CyjIoBaORhY9fVkoNe8hrzgxjSCQ/lQlcfrV31cZb7u0RGOQrKmUX7Bw4FpejrB70ArQ7Mse9mk7+Q==",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/template": "^7.25.0",
+        "@babel/traverse": "^7.25.3",
+        "flow-enums-runtime": "^0.0.6",
+        "nullthrows": "^1.1.1"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">=18.18"
       }
     },
-    "node_modules/object-inspect": {
-      "version": "1.13.4",
-      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
-      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/metro-transform-worker": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/metro-transform-worker/-/metro-transform-worker-0.81.1.tgz",
+      "integrity": "sha512-M+2hVT3rEy5K7PBmGDgQNq3Zx53TjScOcO/CieyLnCRFtBGWZiSJ2+bLAXXOKyKa/y3bI3i0owxtyxuPGDwbZg==",
+      "dependencies": {
+        "@babel/core": "^7.25.2",
+        "@babel/generator": "^7.25.0",
+        "@babel/parser": "^7.25.3",
+        "@babel/types": "^7.25.2",
+        "flow-enums-runtime": "^0.0.6",
+        "metro": "0.81.1",
+        "metro-babel-transformer": "0.81.1",
+        "metro-cache": "0.81.1",
+        "metro-cache-key": "0.81.1",
+        "metro-minify-terser": "0.81.1",
+        "metro-source-map": "0.81.1",
+        "metro-transform-plugins": "0.81.1",
+        "nullthrows": "^1.1.1"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "engines": {
+        "node": ">=18.18"
       }
     },
-    "node_modules/object-keys": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
-      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
-      "engines": {
-        "node": ">= 0.4"
+    "node_modules/metro/node_modules/ci-info": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ci-info/-/ci-info-2.0.0.tgz",
+      "integrity": "sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ=="
+    },
+    "node_modules/metro/node_modules/debug": {
+      "version": "2.6.9",
+      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
+      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
+      "dependencies": {
+        "ms": "2.0.0"
       }
     },
-    "node_modules/object.assign": {
-      "version": "4.1.7",
-      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
-      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+    "node_modules/metro/node_modules/hermes-estree": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-estree/-/hermes-estree-0.25.1.tgz",
+      "integrity": "sha512-0wUoCcLp+5Ev5pDW2OriHC2MJCbwLwuRx+gAqMTOkGKJJiBCLjtrvy4PWUGn6MIVefecRpzoOZ/UV6iGdOr+Cw=="
+    },
+    "node_modules/metro/node_modules/hermes-parser": {
+      "version": "0.25.1",
+      "resolved": "https://registry.npmjs.org/hermes-parser/-/hermes-parser-0.25.1.tgz",
+      "integrity": "sha512-6pEjquH3rqaI6cYAXYPcz9MS4rY6R4ngRgrgfDshRptUZIc3lw0MCIJIGDj9++mfySOuPTHB4nrSW99BCvOPIA==",
       "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0",
-        "has-symbols": "^1.1.0",
-        "object-keys": "^1.1.1"
-      },
+        "hermes-estree": "0.25.1"
+      }
+    },
+    "node_modules/metro/node_modules/ms": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
+    },
+    "node_modules/metro/node_modules/ws": {
+      "version": "7.5.10",
+      "resolved": "https://registry.npmjs.org/ws/-/ws-7.5.10.tgz",
+      "integrity": "sha512-+dbF1tHwZpXcbOJdVOkzLDxZP1ailvSxM6ZweXTegylPny803bFhA+vqBYw4s31NSAk4S2Qz+AKXK9a4wkdjcQ==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.3.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "bufferutil": "^4.0.1",
+        "utf-8-validate": "^5.0.2"
+      },
+      "peerDependenciesMeta": {
+        "bufferutil": {
+          "optional": true
+        },
+        "utf-8-validate": {
+          "optional": true
+        }
       }
     },
-    "node_modules/object.entries": {
-      "version": "1.1.8",
-      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
-      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
-      "dev": true,
+    "node_modules/micromatch": {
+      "version": "4.0.8",
+      "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-4.0.8.tgz",
+      "integrity": "sha512-PXwfBhYu0hBCPw8Dn0E+WDYb7af3dSLVWKi3HGv84IdF4TyFoC0ysxFd0Goxw7nSv4T/PzEJQxsYsEiFCKo2BA==",
       "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+        "braces": "^3.0.3",
+        "picomatch": "^2.3.1"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.6"
       }
     },
-    "node_modules/object.fromentries": {
-      "version": "2.0.8",
-      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
-      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.7",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.2",
-        "es-object-atoms": "^1.0.0"
-      },
+    "node_modules/micromatch/node_modules/picomatch": {
+      "version": "2.3.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-2.3.1.tgz",
+      "integrity": "sha512-JU3teHTNjmE2VCGFzuY8EXzCDVwEqB2a8fsIvwaStHhAWJEeVd1o1QD80CU6+ZdEXXSLbSsuLwJjkCBWqRQUVA==",
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=8.6"
       },
       "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/object.values": {
-      "version": "1.2.1",
-      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
-      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
-      "dev": true,
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "call-bound": "^1.0.3",
-        "define-properties": "^1.2.1",
-        "es-object-atoms": "^1.0.0"
+    "node_modules/mime": {
+      "version": "1.6.0",
+      "resolved": "https://registry.npmjs.org/mime/-/mime-1.6.0.tgz",
+      "integrity": "sha512-x0Vn8spI+wuJ1O6S7gnbaQg8Pxh4NNHb7KSINmEWKiPE4RKOplvijn+NkmYmmRgP68mc70j2EbeTFRsrswaQeg==",
+      "bin": {
+        "mime": "cli.js"
       },
       "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+        "node": ">=4"
       }
     },
-    "node_modules/obuf": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/obuf/-/obuf-1.1.2.tgz",
-      "integrity": "sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg=="
-    },
-    "node_modules/octal": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/octal/-/octal-1.0.0.tgz",
-      "integrity": "sha512-nnda7W8d+A3vEIY+UrDQzzboPf1vhs4JYVhff5CDkq9QNoZY7Xrxeo/htox37j9dZf7yNHevZzqtejWgy1vCqQ=="
+    "node_modules/mime-db": {
+      "version": "1.53.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.53.0.tgz",
+      "integrity": "sha512-oHlN/w+3MQ3rba9rqFr6V/ypF10LSkdwUysQL7GkXoTgIWeV+tcXGA852TBxH+gsh8UWoyhR1hKcoMJTuWflpg==",
+      "engines": {
+        "node": ">= 0.6"
+      }
     },
-    "node_modules/on-finished": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
-      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+    "node_modules/mime-types": {
+      "version": "2.1.35",
+      "resolved": "https://registry.npmjs.org/mime-types/-/mime-types-2.1.35.tgz",
+      "integrity": "sha512-ZDY+bPm5zTTF+YpCrAU9nK0UgICYPT0QtT1NZWFv4s++TNkcgVaT0g6+4R2uI4MjQjzysHB1zxuWL50hzaeXiw==",
       "dependencies": {
-        "ee-first": "1.1.1"
+        "mime-db": "1.52.0"
       },
       "engines": {
-        "node": ">= 0.8"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/on-headers": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
-      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
+    "node_modules/mime-types/node_modules/mime-db": {
+      "version": "1.52.0",
+      "resolved": "https://registry.npmjs.org/mime-db/-/mime-db-1.52.0.tgz",
+      "integrity": "sha512-sPU4uV7dYlvtWJxwwxHD0PuihVNiE7TyAbQ5SWxDCB9mUYvOgroQOwYQQOKPJ8CIbE+1ETVlOoK1UC2nU3gYvg==",
       "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/once": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
-      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
-      "dependencies": {
-        "wrappy": "1"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/onetime": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
-      "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
-      "dependencies": {
-        "mimic-fn": "^1.0.0"
-      },
+    "node_modules/mimic-fn": {
+      "version": "1.2.0",
+      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-1.2.0.tgz",
+      "integrity": "sha512-jf84uxzwiuiIVKiOLpfYk7N46TSy8ubTonmneY9vrpHNAnp0QBt2BxWV9dO3/j+BoVAb+a5G6YDPW3M5HOdMWQ==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/open": {
-      "version": "7.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
-      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
-      "dependencies": {
-        "is-docker": "^2.0.0",
-        "is-wsl": "^2.1.1"
-      },
+    "node_modules/min-indent": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/min-indent/-/min-indent-1.0.1.tgz",
+      "integrity": "sha512-I9jwMn07Sy/IwOj3zVkVik2JTvgpaykDZEigL6Rx6N9LbMywwUSMtxET+7lVoDLLd3O3IXwJwvuuns8UB/HeAg==",
       "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/optionator": {
-      "version": "0.9.4",
-      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
-      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
-      "dev": true,
+    "node_modules/minimatch": {
+      "version": "3.1.2",
+      "resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
+      "integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
       "dependencies": {
-        "deep-is": "^0.1.3",
-        "fast-levenshtein": "^2.0.6",
-        "levn": "^0.4.1",
-        "prelude-ls": "^1.2.1",
-        "type-check": "^0.4.0",
-        "word-wrap": "^1.2.5"
+        "brace-expansion": "^1.1.7"
       },
       "engines": {
-        "node": ">= 0.8.0"
+        "node": "*"
       }
     },
-    "node_modules/ora": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
-      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
-      "dependencies": {
-        "chalk": "^2.4.2",
-        "cli-cursor": "^2.1.0",
-        "cli-spinners": "^2.0.0",
-        "log-symbols": "^2.2.0",
-        "strip-ansi": "^5.2.0",
-        "wcwidth": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=6"
+    "node_modules/minimist": {
+      "version": "1.2.8",
+      "resolved": "https://registry.npmjs.org/minimist/-/minimist-1.2.8.tgz",
+      "integrity": "sha512-2yyAR8qBkN3YuheJanUpWC5U3bb5osDywNB8RzDVlDwDHbocAJveqqj1u8+SVD7jkWT4yvsHCpWqqWqAxb0zCA==",
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/ora/node_modules/ansi-regex": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
-      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
+    "node_modules/minipass": {
+      "version": "7.1.2",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-7.1.2.tgz",
+      "integrity": "sha512-qOOzS1cBTWYF4BH8fVePDBOO9iptMnGUEZwNc/cMWnTV2nVLZ7VoNWEPHkYczZA0pdoA7dl6e7FL659nX9S2aw==",
       "engines": {
-        "node": ">=6"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/ora/node_modules/ansi-styles": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
-      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
+    "node_modules/minipass-collect": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/minipass-collect/-/minipass-collect-2.0.1.tgz",
+      "integrity": "sha512-D7V8PO9oaz7PWGLbCACuI1qEOsq7UKfLotx/C0Aet43fCUB/wfQ7DYeq2oR/svFJGYDHPr38SHATeaj/ZoKHKw==",
       "dependencies": {
-        "color-convert": "^1.9.0"
+        "minipass": "^7.0.3"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=16 || 14 >=14.17"
       }
     },
-    "node_modules/ora/node_modules/chalk": {
-      "version": "2.4.2",
-      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
-      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
-      "dependencies": {
-        "ansi-styles": "^3.2.1",
-        "escape-string-regexp": "^1.0.5",
-        "supports-color": "^5.3.0"
+    "node_modules/minipass-flush": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/minipass-flush/-/minipass-flush-1.0.5.tgz",
+      "integrity": "sha512-JmQSYYpPUqX5Jyn1mXaRwOda1uQ8HP5KAT/oDSLCzt1BYRhQU0/hDtsB1ufZfEEzMZ9aAVmsBw8+FWsIXlClWw==",
+      "dependencies": {
+        "minipass": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">= 8"
       }
     },
-    "node_modules/ora/node_modules/color-convert": {
-      "version": "1.9.3",
-      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
-      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+    "node_modules/minipass-flush/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dependencies": {
-        "color-name": "1.1.3"
+        "yallist": "^4.0.0"
+      },
+      "engines": {
+        "node": ">=8"
       }
     },
-    "node_modules/ora/node_modules/color-name": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
-      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    "node_modules/minipass-flush/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
     },
-    "node_modules/ora/node_modules/escape-string-regexp": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
-      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+    "node_modules/minipass-pipeline": {
+      "version": "1.2.4",
+      "resolved": "https://registry.npmjs.org/minipass-pipeline/-/minipass-pipeline-1.2.4.tgz",
+      "integrity": "sha512-xuIq7cIOt09RPRJ19gdi4b+RiNvDFYe5JH+ggNvBqGqpQXcru3PcRmOZuHBKWK1Txf9+cQ+HMVN4d6z46LZP7A==",
+      "dependencies": {
+        "minipass": "^3.0.0"
+      },
       "engines": {
-        "node": ">=0.8.0"
+        "node": ">=8"
       }
     },
-    "node_modules/ora/node_modules/has-flag": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
-      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
+    "node_modules/minipass-pipeline/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
+      "dependencies": {
+        "yallist": "^4.0.0"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/ora/node_modules/strip-ansi": {
-      "version": "5.2.0",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
-      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
+    "node_modules/minipass-pipeline/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/minizlib": {
+      "version": "2.1.2",
+      "resolved": "https://registry.npmjs.org/minizlib/-/minizlib-2.1.2.tgz",
+      "integrity": "sha512-bAxsR8BVfj60DWXHE3u30oHzfl4G7khkSuPW+qvpd7jFRHm7dLxOjUk1EHACJ/hxLY8phGJ0YhYHZo7jil7Qdg==",
       "dependencies": {
-        "ansi-regex": "^4.1.0"
+        "minipass": "^3.0.0",
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 8"
       }
     },
-    "node_modules/ora/node_modules/supports-color": {
-      "version": "5.5.0",
-      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
-      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
+    "node_modules/minizlib/node_modules/minipass": {
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/minipass/-/minipass-3.3.6.tgz",
+      "integrity": "sha512-DxiNidxSEK+tHG6zOIklvNOwm3hvCrbUrdtzY74U6HKTJxvIDfOUL5W5P2Ghd3DTkhhKPYGqeNUIh5qcM4YBfw==",
       "dependencies": {
-        "has-flag": "^3.0.0"
+        "yallist": "^4.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=8"
       }
     },
-    "node_modules/os-homedir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-homedir/-/os-homedir-1.0.2.tgz",
-      "integrity": "sha512-B5JU3cabzk8c67mRRd3ECmROafjYMXbuzlwtqdM8IbS8ktlTix8aFGb2bAGKrSRIlnfKwovGUUr72JUPyOb6kQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.10.0"
+    "node_modules/minizlib/node_modules/yallist": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
+      "integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
+    },
+    "node_modules/mkdirp": {
+      "version": "0.5.6",
+      "resolved": "https://registry.npmjs.org/mkdirp/-/mkdirp-0.5.6.tgz",
+      "integrity": "sha512-FP+p8RB8OWpF3YZBCrP5gtADmtXApB5AMLn+vdyA+PyxCjrCs00mjyUozssO33cwDeT3wNGdLxJ5M//YqtHAJw==",
+      "dependencies": {
+        "minimist": "^1.2.6"
+      },
+      "bin": {
+        "mkdirp": "bin/cmd.js"
       }
     },
-    "node_modules/os-tmpdir": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
-      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
+    "node_modules/moment": {
+      "version": "2.30.1",
+      "resolved": "https://registry.npmjs.org/moment/-/moment-2.30.1.tgz",
+      "integrity": "sha512-uEmtNhbDOrWPFS+hdjFCBfy9f2YoyzRpwcl+DqpC6taX21FzsTLQVbMV/W7PzNSX6x/bhC1zA3c2UQ5NzH6how==",
+      "license": "MIT",
+      "optional": true,
       "engines": {
-        "node": ">=0.10.0"
+        "node": "*"
       }
     },
-    "node_modules/osenv": {
-      "version": "0.1.5",
-      "resolved": "https://registry.npmjs.org/osenv/-/osenv-0.1.5.tgz",
-      "integrity": "sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==",
-      "deprecated": "This package is no longer supported.",
-      "peer": true,
+    "node_modules/ms": {
+      "version": "2.1.3",
+      "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.3.tgz",
+      "integrity": "sha512-6FlzubTLZG3J2a/NVCAleEhjzq5oxgHyaCU9yYXvcLsvoVaHJq/s5xXI6/XXP6tz7R9xAOtHnSO/tXtF3WRTlA=="
+    },
+    "node_modules/mz": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/mz/-/mz-2.7.0.tgz",
+      "integrity": "sha512-z81GNO7nnYMEhrGh9LeymoE4+Yr0Wn5McHIZMK5cfQCl+NDX08sCZgUc9/6MHni9IWuFLm1Z3HTCXu2z9fN62Q==",
       "dependencies": {
-        "os-homedir": "^1.0.0",
-        "os-tmpdir": "^1.0.0"
+        "any-promise": "^1.0.0",
+        "object-assign": "^4.0.1",
+        "thenify-all": "^1.0.0"
       }
     },
-    "node_modules/own-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
-      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+    "node_modules/nanoid": {
+      "version": "3.3.8",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.8.tgz",
+      "integrity": "sha512-WNLf5Sd8oZxOm+TzppcYk8gVOgP+l58xNy58D0nbUnOxOWRWvlcCV4kUF7ltmI6PsrLl/BgKEyS4mqsGChFN0w==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
+      "bin": {
+        "nanoid": "bin/nanoid.cjs"
+      },
+      "engines": {
+        "node": "^10 || ^12 || ^13.7 || ^14 || >=15.0.1"
+      }
+    },
+    "node_modules/nativewind": {
+      "version": "4.0.36",
+      "resolved": "https://registry.npmjs.org/nativewind/-/nativewind-4.0.36.tgz",
+      "integrity": "sha512-nd0Xgjzaq0ISvUAjibZXcuSvvpX1BGX2mfOGBPZpjGfHL3By6fwLGsNhrKU6mi2FF30c+kdok3e2I4k/O0UO1Q==",
+      "license": "MIT",
       "dependencies": {
-        "get-intrinsic": "^1.2.6",
-        "object-keys": "^1.1.1",
-        "safe-push-apply": "^1.0.0"
+        "react-native-css-interop": "0.0.36"
       },
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=16"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
+      "peerDependencies": {
+        "tailwindcss": ">3.3.0"
       }
     },
-    "node_modules/p-finally": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
-      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+    "node_modules/natural-compare": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
+      "integrity": "sha512-OWND8ei3VtNC9h7V60qff3SVobHr996CTwgxubgyQYEpg290h9J0buyECNNJexkFm5sOajh5G116RYA1c8ZMSw=="
+    },
+    "node_modules/negotiator": {
+      "version": "0.6.3",
+      "resolved": "https://registry.npmjs.org/negotiator/-/negotiator-0.6.3.tgz",
+      "integrity": "sha512-+EUsqGPLsM+j/zdChZjsnX51g4XrHFOIXwfnCVPGlQk/k5giakcKsuxCObBRu6DSm9opw/O6slWbJdghQM4bBg==",
       "engines": {
-        "node": ">=4"
+        "node": ">= 0.6"
       }
     },
-    "node_modules/p-limit": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
-      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
+    "node_modules/neo-async": {
+      "version": "2.6.2",
+      "resolved": "https://registry.npmjs.org/neo-async/-/neo-async-2.6.2.tgz",
+      "integrity": "sha512-Yd3UES5mWCSqR+qNT93S3UoYUkqAZ9lLg8a7g9rimsWmYGK8cVToA4/sF3RrshdyV3sAGMXVUmpMYOw+dLpOuw=="
+    },
+    "node_modules/nested-error-stacks": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/nested-error-stacks/-/nested-error-stacks-2.0.1.tgz",
+      "integrity": "sha512-SrQrok4CATudVzBS7coSz26QRSmlK9TzzoFbeKfcPBUFPjcQM9Rqvr/DlJkOrwI/0KcgvMub1n1g5Jt9EgRn4A=="
+    },
+    "node_modules/nice-try": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
+      "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
+    },
+    "node_modules/no-case": {
+      "version": "3.0.4",
+      "resolved": "https://registry.npmjs.org/no-case/-/no-case-3.0.4.tgz",
+      "integrity": "sha512-fgAN3jGAh+RoxUGZHTSOLJIqUc2wmoBwGR4tbpNAKmmovFoWq0OdRkb0VkldReO2a2iBT/OEulG9XSUc10r3zg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "yocto-queue": "^0.1.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "lower-case": "^2.0.2",
+        "tslib": "^2.0.3"
       }
     },
-    "node_modules/p-locate": {
-      "version": "5.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
-      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+    "node_modules/node-dir": {
+      "version": "0.1.17",
+      "resolved": "https://registry.npmjs.org/node-dir/-/node-dir-0.1.17.tgz",
+      "integrity": "sha512-tmPX422rYgofd4epzrNoOXiE8XFZYOcCq1vD7MAXCDO+O+zndlA2ztdKKMa+EeuBG5tHETpr4ml4RGgpqDCCAg==",
       "dependencies": {
-        "p-limit": "^3.0.2"
+        "minimatch": "^3.0.2"
       },
       "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">= 0.10.5"
       }
     },
-    "node_modules/p-map": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
-      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
+    "node_modules/node-fetch": {
+      "version": "2.7.0",
+      "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz",
+      "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==",
       "dependencies": {
-        "aggregate-error": "^3.0.0"
+        "whatwg-url": "^5.0.0"
       },
       "engines": {
-        "node": ">=10"
+        "node": "4.x || >=6.0.0"
       },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/p-retry": {
-      "version": "4.6.2",
-      "resolved": "https://registry.npmjs.org/p-retry/-/p-retry-4.6.2.tgz",
-      "integrity": "sha512-312Id396EbJdvRONlngUx0NydfrIQ5lsYu0znKVUzVvArzEIt08V1qhtyESbGVd1FGX7UKtiFp5uwKZdM8wIuQ==",
-      "dependencies": {
-        "@types/retry": "0.12.0",
-        "retry": "^0.13.1"
+      "peerDependencies": {
+        "encoding": "^0.1.0"
       },
-      "engines": {
-        "node": ">=8"
+      "peerDependenciesMeta": {
+        "encoding": {
+          "optional": true
+        }
       }
     },
-    "node_modules/p-try": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
-      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
+    "node_modules/node-forge": {
+      "version": "1.3.1",
+      "resolved": "https://registry.npmjs.org/node-forge/-/node-forge-1.3.1.tgz",
+      "integrity": "sha512-dPEtOeMvF9VMcYV/1Wb8CPoVAXtp6MKMlcbAt4ddqmGqUJ6fQZFXkNZNkNlfevtNkGtaSoXf/vNNNSvgrdXwtA==",
       "engines": {
-        "node": ">=6"
+        "node": ">= 6.13.0"
       }
     },
-    "node_modules/package-json-from-dist": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
-      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
+    "node_modules/node-int64": {
+      "version": "0.4.0",
+      "resolved": "https://registry.npmjs.org/node-int64/-/node-int64-0.4.0.tgz",
+      "integrity": "sha512-O5lz91xSOeoXP6DulyHfllpq+Eg00MWitZIbtPfoSEvqIHdl5gfcY6hYzDWnj0qD5tz52PI08u9qUvSVeUBeHw=="
     },
-    "node_modules/pako": {
-      "version": "0.2.9",
-      "resolved": "https://registry.npmjs.org/pako/-/pako-0.2.9.tgz",
-      "integrity": "sha512-NUcwaKxUxWrZLpDG+z/xZaCgQITkA/Dv4V/T6bw7VON6l1Xz/VnrBqrYjZQ12TamKHzITTfOEIYUj48y2KXImA=="
+    "node_modules/node-releases": {
+      "version": "2.0.19",
+      "resolved": "https://registry.npmjs.org/node-releases/-/node-releases-2.0.19.tgz",
+      "integrity": "sha512-xxOWJsBKtzAq7DY0J+DTzuz58K8e7sJbdgwkbMWQe8UYB6ekmsQ45q0M/tJDsGaZmbC+l7n57UV8Hl5tHxO9uw=="
     },
-    "node_modules/param-case": {
-      "version": "3.0.4",
-      "resolved": "https://registry.npmjs.org/param-case/-/param-case-3.0.4.tgz",
-      "integrity": "sha512-RXlj7zCYokReqWpOPH9oYivUzLYZ5vAPIfEmCTNViosC78F8F0H9y7T7gG2M39ymgutxF5gcFEsyZQSph9Bp3A==",
-      "dependencies": {
-        "dot-case": "^3.0.4",
-        "tslib": "^2.0.3"
+    "node_modules/normalize-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
+      "integrity": "sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA==",
+      "engines": {
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/parent-module": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
-      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
+    "node_modules/npm-package-arg": {
+      "version": "11.0.3",
+      "resolved": "https://registry.npmjs.org/npm-package-arg/-/npm-package-arg-11.0.3.tgz",
+      "integrity": "sha512-sHGJy8sOC1YraBywpzQlIKBE4pBbGbiF95U6Auspzyem956E0+FtDtsx1ZxlOJkQCZ1AFXAY/yuvtFYrOxF+Bw==",
       "dependencies": {
-        "callsites": "^3.0.0"
+        "hosted-git-info": "^7.0.0",
+        "proc-log": "^4.0.0",
+        "semver": "^7.3.5",
+        "validate-npm-package-name": "^5.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": "^16.14.0 || >=18.0.0"
       }
     },
-    "node_modules/parent-module/node_modules/callsites": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-      "dev": true,
+    "node_modules/npm-package-arg/node_modules/semver": {
+      "version": "7.7.1",
+      "resolved": "https://registry.npmjs.org/semver/-/semver-7.7.1.tgz",
+      "integrity": "sha512-hlq8tAfn0m/61p4BVRcPzIGr6LKiMwo4VM6dGi6pt4qcRkmNzTcWq6eCEjEh+qXjkMDvPlOFFSGwQjoEa6gyMA==",
+      "bin": {
+        "semver": "bin/semver.js"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
       }
     },
-    "node_modules/parse-json": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
-      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
+    "node_modules/npm-run-path": {
+      "version": "2.0.2",
+      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-2.0.2.tgz",
+      "integrity": "sha512-lJxZYlT4DW/bRUtFh1MQIWqmLwQfAxnqWG4HhEdjMlkrJYnJn0Jrr2u3mgxqaWsdiBc76TYkTG/mhrnYTuzfHw==",
       "dependencies": {
-        "error-ex": "^1.3.1",
-        "json-parse-better-errors": "^1.0.1"
+        "path-key": "^2.0.0"
       },
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/parse-png": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/parse-png/-/parse-png-2.1.0.tgz",
-      "integrity": "sha512-Nt/a5SfCLiTnQAjx3fHlqp8hRgTL3z7kTQZzvIMS9uCAepnCyjpdEc6M/sz69WqMBdaDBw9sF1F1UaHROYzGkQ==",
-      "dependencies": {
-        "pngjs": "^3.3.0"
-      },
+    "node_modules/npm-run-path/node_modules/path-key": {
+      "version": "2.0.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-2.0.1.tgz",
+      "integrity": "sha512-fEHGKCSmUSDPv4uoj8AlD+joPlq3peND+HRYyxFz4KPw4z926S/b8rIuFs2FYJg3BwsxJf6A9/3eIdLaYC+9Dw==",
       "engines": {
-        "node": ">=10"
+        "node": ">=4"
       }
     },
-    "node_modules/parse5": {
-      "version": "7.2.1",
-      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
-      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
+    "node_modules/nth-check": {
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/nth-check/-/nth-check-2.1.1.tgz",
+      "integrity": "sha512-lqjrjmaOoAnWfMmBPL+XNnynZh2+swxiX3WUE0s4yEHI6m+AwrK2UZOimIRl3X/4QctVqS8AiZjFqyOGrMXb/w==",
       "dependencies": {
-        "entities": "^4.5.0"
+        "boolbase": "^1.0.0"
       },
       "funding": {
-        "url": "https://github.com/inikulin/parse5?sponsor=1"
+        "url": "https://github.com/fb55/nth-check?sponsor=1"
       }
     },
-    "node_modules/parseurl": {
-      "version": "1.3.3",
-      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
-      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
-      "engines": {
-        "node": ">= 0.8"
-      }
+    "node_modules/nullthrows": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/nullthrows/-/nullthrows-1.1.1.tgz",
+      "integrity": "sha512-2vPPEi+Z7WqML2jZYddDIfy5Dqb0r2fze2zTxNNknZaFpVHU3mFB3R+DWeJWGVx0ecvttSGlJTI+WG+8Z4cDWw=="
     },
-    "node_modules/pascal-case": {
-      "version": "3.1.2",
-      "resolved": "https://registry.npmjs.org/pascal-case/-/pascal-case-3.1.2.tgz",
-      "integrity": "sha512-uWlGT3YSnK9x3BQJaOdcZwrnV6hPpd8jFH1/ucpiLRPh/2zCVJKS19E4GvYHvaCcACn3foXZ0cLB9Wrx1KGe5g==",
-      "dependencies": {
-        "no-case": "^3.0.4",
-        "tslib": "^2.0.3"
-      }
+    "node_modules/nwsapi": {
+      "version": "2.2.16",
+      "resolved": "https://registry.npmjs.org/nwsapi/-/nwsapi-2.2.16.tgz",
+      "integrity": "sha512-F1I/bimDpj3ncaNDhfyMWuFqmQDBwDB0Fogc2qpL3BWvkQteFD/8BzWuIRl83rq0DXfm8SGt/HFhLXZyljTXcQ=="
     },
-    "node_modules/password-prompt": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz",
-      "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==",
+    "node_modules/ob1": {
+      "version": "0.81.1",
+      "resolved": "https://registry.npmjs.org/ob1/-/ob1-0.81.1.tgz",
+      "integrity": "sha512-1PEbvI+AFvOcgdNcO79FtDI1TUO8S3lhiKOyAiyWQF3sFDDKS+aw2/BZvGlArFnSmqckwOOB9chQuIX0/OahoQ==",
       "dependencies": {
-        "ansi-escapes": "^4.3.2",
-        "cross-spawn": "^7.0.3"
-      }
-    },
-    "node_modules/path-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/path-browserify/-/path-browserify-0.0.0.tgz",
-      "integrity": "sha512-WA3pxi1olUQcsl82W576vkqhUSGp0uBtr/381pxx5WXLp3NC+AB99hUG3aGW7H0Kg9PFr1D8wv1iJeICe+9Mhw=="
-    },
-    "node_modules/path-dirname": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
-      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
-      "dev": true,
-      "license": "MIT"
-    },
-    "node_modules/path-exists": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
-      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
+        "flow-enums-runtime": "^0.0.6"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">=18.18"
       }
     },
-    "node_modules/path-is-absolute": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
-      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
+    "node_modules/object-assign": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/object-assign/-/object-assign-4.1.1.tgz",
+      "integrity": "sha512-rJgTQnkUnH1sFw8yT6VSU3zD3sWmu6sZhIseY8VX+GRu3P6F7Fu+JNDoXfklElbLJSnc3FUQHVe4cU5hj+BcUg==",
       "engines": {
         "node": ">=0.10.0"
       }
     },
-    "node_modules/path-is-inside": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/path-is-inside/-/path-is-inside-1.0.2.tgz",
-      "integrity": "sha512-DUWJr3+ULp4zXmol/SZkFf3JGsS9/SIv+Y3Rt93/UjPpDpklB5f1er4O3POIbUuUJ3FXgqte2Q7SrU6zAqwk8w=="
+    "node_modules/object-hash": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/object-hash/-/object-hash-3.0.0.tgz",
+      "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==",
+      "engines": {
+        "node": ">= 6"
+      }
     },
-    "node_modules/path-key": {
-      "version": "3.1.1",
-      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
-      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
+    "node_modules/object-inspect": {
+      "version": "1.13.4",
+      "resolved": "https://registry.npmjs.org/object-inspect/-/object-inspect-1.13.4.tgz",
+      "integrity": "sha512-W67iLl4J2EXEGTbfeHCffrjDfitvLANg0UlX3wFUUSTx92KXRFegMHUVgSqE+wvhAbi4WqjGg9czysTV2Epbew==",
+      "dev": true,
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/path-parse": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
-      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    "node_modules/object-keys": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/object-keys/-/object-keys-1.1.1.tgz",
+      "integrity": "sha512-NuAESUOUMrlIXOfHKzD6bpPu3tYt3xvjNdRIQ+FeT0lNb4K8WR70CaDxhuNguS2XG+GjkyMwOzsN5ZktImfhLA==",
+      "dev": true,
+      "engines": {
+        "node": ">= 0.4"
+      }
     },
-    "node_modules/path-scurry": {
-      "version": "1.11.1",
-      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
-      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
+    "node_modules/object.assign": {
+      "version": "4.1.7",
+      "resolved": "https://registry.npmjs.org/object.assign/-/object.assign-4.1.7.tgz",
+      "integrity": "sha512-nK28WOo+QIjBkDduTINE4JkF/UJJKyf2EJxvJKfblDpyg0Q+pkOHNTL0Qwy6NP6FhE/EnzV73BxxqcJaXY9anw==",
+      "dev": true,
       "dependencies": {
-        "lru-cache": "^10.2.0",
-        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0",
+        "has-symbols": "^1.1.0",
+        "object-keys": "^1.1.1"
       },
       "engines": {
-        "node": ">=16 || 14 >=14.18"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/isaacs"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/path-scurry/node_modules/lru-cache": {
-      "version": "10.4.3",
-      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
-      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
-    },
-    "node_modules/path-to-regexp": {
-      "version": "0.1.12",
-      "resolved": "https://registry.npmjs.org/path-to-regexp/-/path-to-regexp-0.1.12.tgz",
-      "integrity": "sha512-RA1GjUVMnvYFxuqovrEqZoxxW5NUZqbwKtYz/Tt7nXerk0LbLblQmrsgdeOxV5SFHf0UDggjS/bSeOZwt1pmEQ=="
-    },
-    "node_modules/path-type": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
-      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
+    "node_modules/object.entries": {
+      "version": "1.1.8",
+      "resolved": "https://registry.npmjs.org/object.entries/-/object.entries-1.1.8.tgz",
+      "integrity": "sha512-cmopxi8VwRIAw/fkijJohSfpef5PdN0pMQJN6VC/ZKvn0LIknWD8KtgY6KlQdEc4tIjcQ3HxSMmnvtzIscdaYQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
       "engines": {
-        "node": ">=8"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/picocolors": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
-      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    "node_modules/object.fromentries": {
+      "version": "2.0.8",
+      "resolved": "https://registry.npmjs.org/object.fromentries/-/object.fromentries-2.0.8.tgz",
+      "integrity": "sha512-k6E21FzySsSK5a21KRADBd/NGneRegFO5pLHfdQLpRDETUNJueLXs3WCzyQ3tFRDYgbq3KHGXfTbi2bs8WQ6rQ==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.7",
+        "define-properties": "^1.2.1",
+        "es-abstract": "^1.23.2",
+        "es-object-atoms": "^1.0.0"
+      },
+      "engines": {
+        "node": ">= 0.4"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/ljharb"
+      }
     },
-    "node_modules/picomatch": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
-      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
+    "node_modules/object.values": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/object.values/-/object.values-1.2.1.tgz",
+      "integrity": "sha512-gXah6aZrcUxjWg2zR2MwouP2eHlCBzdV4pygudehaKXSGW4v2AsRQUK+lwwXhii6KFZcunEnmSUoYp5CXibxtA==",
+      "dev": true,
+      "dependencies": {
+        "call-bind": "^1.0.8",
+        "call-bound": "^1.0.3",
+        "define-properties": "^1.2.1",
+        "es-object-atoms": "^1.0.0"
+      },
       "engines": {
-        "node": ">=10"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/jonschlinkert"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/pify": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
-      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+    "node_modules/on-finished": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/on-finished/-/on-finished-2.3.0.tgz",
+      "integrity": "sha512-ikqdkGAAyf/X/gPhXGvfgAytDZtDbr+bkNUJ0N9h5MI/dmdgCs3l6hoHrcUv41sRKew3jIwrp4qQDXiK99Utww==",
+      "dependencies": {
+        "ee-first": "1.1.1"
+      },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/pinkie": {
-      "version": "2.0.4",
-      "resolved": "https://registry.npmjs.org/pinkie/-/pinkie-2.0.4.tgz",
-      "integrity": "sha512-MnUuEycAemtSaeFSjXKW/aroV7akBbY+Sv+RkyqFjgAe73F+MR0TBWKBRDkmfWq/HiFmdavfZ1G7h4SPZXaCSg==",
+    "node_modules/on-headers": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/on-headers/-/on-headers-1.0.2.tgz",
+      "integrity": "sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==",
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">= 0.8"
+      }
+    },
+    "node_modules/once": {
+      "version": "1.4.0",
+      "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
+      "integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
+      "dependencies": {
+        "wrappy": "1"
       }
     },
-    "node_modules/pinkie-promise": {
+    "node_modules/onetime": {
       "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/pinkie-promise/-/pinkie-promise-2.0.1.tgz",
-      "integrity": "sha512-0Gni6D4UcLTbv9c57DfxDGdr41XfgUjqWZu492f0cIGr16zDU06BWP/RAEvOuo7CQ0CNjHaLlM59YJJFm3NWlw==",
+      "resolved": "https://registry.npmjs.org/onetime/-/onetime-2.0.1.tgz",
+      "integrity": "sha512-oyyPpiMaKARvvcgip+JV+7zci5L8D1W9RZIz2l1o08AM3pfspitVWnPt3mzHcBPp12oYMTy0pqrFs/C+m3EwsQ==",
       "dependencies": {
-        "pinkie": "^2.0.0"
+        "mimic-fn": "^1.0.0"
       },
       "engines": {
-        "node": ">=0.10.0"
+        "node": ">=4"
       }
     },
-    "node_modules/pirates": {
-      "version": "4.0.6",
-      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
-      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
+    "node_modules/open": {
+      "version": "7.4.2",
+      "resolved": "https://registry.npmjs.org/open/-/open-7.4.2.tgz",
+      "integrity": "sha512-MVHddDVweXZF3awtlAS+6pgKLlm/JgxZ90+/NBurBoQctVOOB/zDdVjcyPzQ+0laDGbsWgrRkflI65sQeOgT9Q==",
+      "dependencies": {
+        "is-docker": "^2.0.0",
+        "is-wsl": "^2.1.1"
+      },
       "engines": {
-        "node": ">= 6"
+        "node": ">=8"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pkg-dir": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
-      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
+    "node_modules/optionator": {
+      "version": "0.9.4",
+      "resolved": "https://registry.npmjs.org/optionator/-/optionator-0.9.4.tgz",
+      "integrity": "sha512-6IpQ7mKUxRcZNLIObR0hz7lxsapSSIYNZJwXPGeF0mTVqGKFIXj1DQcMoT22S3ROcLyY/rz0PWaWZ9ayWmad9g==",
+      "dev": true,
       "dependencies": {
-        "find-up": "^3.0.0"
+        "deep-is": "^0.1.3",
+        "fast-levenshtein": "^2.0.6",
+        "levn": "^0.4.1",
+        "prelude-ls": "^1.2.1",
+        "type-check": "^0.4.0",
+        "word-wrap": "^1.2.5"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.8.0"
       }
     },
-    "node_modules/pkg-dir/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+    "node_modules/ora": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/ora/-/ora-3.4.0.tgz",
+      "integrity": "sha512-eNwHudNbO1folBP3JsZ19v9azXWtQZjICdr3Q0TDPIaeBQ3mXLrh54wM+er0+hSp+dWKf+Z8KM58CYzEyIYxYg==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "chalk": "^2.4.2",
+        "cli-cursor": "^2.1.0",
+        "cli-spinners": "^2.0.0",
+        "log-symbols": "^2.2.0",
+        "strip-ansi": "^5.2.0",
+        "wcwidth": "^1.0.1"
       },
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/pkg-dir/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
+    "node_modules/ora/node_modules/ansi-regex": {
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/ansi-regex/-/ansi-regex-4.1.1.tgz",
+      "integrity": "sha512-ILlv4k/3f6vfQ4OoP2AGvirOktlQ98ZEL1k9FaQjxa3L1abBgbuTDAdPOpvbGncC0BTVQrl+OM8xZGK6tWXt7g==",
       "engines": {
         "node": ">=6"
       }
     },
-    "node_modules/pkg-dir/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+    "node_modules/ora/node_modules/ansi-styles": {
+      "version": "3.2.1",
+      "resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-3.2.1.tgz",
+      "integrity": "sha512-VT0ZI6kZRdTh8YyJw3SMbYm/u+NqfsAxEpWO0Pf9sq8/e94WxxOpPKx9FR1FlyCtOVDNOQ+8ntlqFxiRc+r5qA==",
       "dependencies": {
-        "p-try": "^2.0.0"
+        "color-convert": "^1.9.0"
       },
       "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "node": ">=4"
       }
     },
-    "node_modules/pkg-dir/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+    "node_modules/ora/node_modules/chalk": {
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+      "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "ansi-styles": "^3.2.1",
+        "escape-string-regexp": "^1.0.5",
+        "supports-color": "^5.3.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/pkg-dir/node_modules/path-exists": {
+    "node_modules/ora/node_modules/color-convert": {
+      "version": "1.9.3",
+      "resolved": "https://registry.npmjs.org/color-convert/-/color-convert-1.9.3.tgz",
+      "integrity": "sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==",
+      "dependencies": {
+        "color-name": "1.1.3"
+      }
+    },
+    "node_modules/ora/node_modules/color-name": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz",
+      "integrity": "sha512-72fSenhMw2HZMTVHeCA9KCmpEIbzWiQsjN+BHcBbS9vr1mtt+vJjPdksIBNUmKAW8TFUDPJK5SUU3QhE9NEXDw=="
+    },
+    "node_modules/ora/node_modules/escape-string-regexp": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz",
+      "integrity": "sha512-vbRorB5FUQWvla16U8R/qgaFIya2qGzwDrNmCZuYKrbdSUMG6I1ZCGQRefkRVhuOkIGVne7BQ35DSfo1qvJqFg==",
+      "engines": {
+        "node": ">=0.8.0"
+      }
+    },
+    "node_modules/ora/node_modules/has-flag": {
       "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "resolved": "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz",
+      "integrity": "sha512-sKJf1+ceQBr4SMkvQnBDNDtf4TXpVhVGateu0t918bl30FnbE2m4vNLX+VWe/dpjlb+HugGYzW7uQXH98HPEYw==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/pkg-up": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
-      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
-      "license": "MIT",
+    "node_modules/ora/node_modules/strip-ansi": {
+      "version": "5.2.0",
+      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-5.2.0.tgz",
+      "integrity": "sha512-DuRs1gKbBqsMKIZlrffwlug8MHkcnpjs5VPmL1PAh+mA30U0DTotfDZ0d2UUsXpPmPmMMJ6W773MaA3J+lbiWA==",
       "dependencies": {
-        "find-up": "^3.0.0"
+        "ansi-regex": "^4.1.0"
       },
       "engines": {
-        "node": ">=8"
+        "node": ">=6"
       }
     },
-    "node_modules/pkg-up/node_modules/find-up": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
-      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
-      "license": "MIT",
+    "node_modules/ora/node_modules/supports-color": {
+      "version": "5.5.0",
+      "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-5.5.0.tgz",
+      "integrity": "sha512-QjVjwdXIt408MIiAqCX4oUKsgU2EqAGzs2Ppkm4aQYbjm+ZEWEcW4SfFNTr4uMNZma0ey4f5lgLrkB0aX0QMow==",
       "dependencies": {
-        "locate-path": "^3.0.0"
+        "has-flag": "^3.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=4"
       }
     },
-    "node_modules/pkg-up/node_modules/locate-path": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
-      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
-      "license": "MIT",
-      "dependencies": {
-        "p-locate": "^3.0.0",
-        "path-exists": "^3.0.0"
-      },
+    "node_modules/os-tmpdir": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz",
+      "integrity": "sha512-D2FR03Vir7FIu45XBY20mTb+/ZSWB00sjU9jdQXt83gDrI4Ztz5Fs7/yy74g2N5SVQY4xY1qDr4rNddwYRVX0g==",
       "engines": {
-        "node": ">=6"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/pkg-up/node_modules/p-limit": {
-      "version": "2.3.0",
-      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
-      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
-      "license": "MIT",
+    "node_modules/own-keys": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/own-keys/-/own-keys-1.0.1.tgz",
+      "integrity": "sha512-qFOyK5PjiWZd+QQIh+1jhdb9LpxTF0qs7Pm8o5QHYZ0M3vKqSqzsZaEB6oWlxZ+q2sJBMI/Ktgd2N5ZwQoRHfg==",
+      "dev": true,
       "dependencies": {
-        "p-try": "^2.0.0"
+        "get-intrinsic": "^1.2.6",
+        "object-keys": "^1.1.1",
+        "safe-push-apply": "^1.0.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">= 0.4"
       },
       "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
+        "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/pkg-up/node_modules/p-locate": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
-      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
-      "license": "MIT",
+    "node_modules/p-finally": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/p-finally/-/p-finally-1.0.0.tgz",
+      "integrity": "sha512-LICb2p9CB7FS+0eR1oqWnHhp0FljGLZCWBE9aix0Uye9W8LTQPwMTYVGWQWIw9RdQiDg4+epXQODwIYJtSJaow==",
+      "engines": {
+        "node": ">=4"
+      }
+    },
+    "node_modules/p-limit": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-3.1.0.tgz",
+      "integrity": "sha512-TYOanM3wGwNGsZN2cVTYPArw454xnXj5qmWF1bEoAc4+cU/ol7GVh7odevjp1FNHduHc3KZMcFduxU5Xc6uJRQ==",
       "dependencies": {
-        "p-limit": "^2.0.0"
+        "yocto-queue": "^0.1.0"
       },
       "engines": {
-        "node": ">=6"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pkg-up/node_modules/path-exists": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
-      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
-      "license": "MIT",
+    "node_modules/p-locate": {
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-5.0.0.tgz",
+      "integrity": "sha512-LaNjtRWUBY++zB5nE/NwcaoMylSPk+S+ZHNB1TzdbMJMny6dynpAGt7X/tl/QYq3TIeE6nxHppbo2LGymrG5Pw==",
+      "dependencies": {
+        "p-limit": "^3.0.2"
+      },
       "engines": {
-        "node": ">=4"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/plist": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
-      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
+    "node_modules/p-map": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-4.0.0.tgz",
+      "integrity": "sha512-/bjOqmgETBYB5BoEeGVea8dmvHb2m9GLy1E9W43yeyfP6QQCZGFNa+XRceJEuDB6zqr+gKpIAmlLebMpykw/MQ==",
       "dependencies": {
-        "@xmldom/xmldom": "^0.8.8",
-        "base64-js": "^1.5.1",
-        "xmlbuilder": "^15.1.1"
+        "aggregate-error": "^3.0.0"
       },
       "engines": {
-        "node": ">=10.4.0"
+        "node": ">=10"
+      },
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/plist/node_modules/@xmldom/xmldom": {
-      "version": "0.8.10",
-      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
-      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
+    "node_modules/p-try": {
+      "version": "2.2.0",
+      "resolved": "https://registry.npmjs.org/p-try/-/p-try-2.2.0.tgz",
+      "integrity": "sha512-R4nPAVTAU0B9D35/Gk3uJf/7XYbQcyohSKdvAxIRSNghFl4e71hVoGnBNQz9cWaXxO2I10KTC+3jMdvvoKw6dQ==",
       "engines": {
-        "node": ">=10.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/plist/node_modules/xmlbuilder": {
-      "version": "15.1.1",
-      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
-      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
-      "engines": {
-        "node": ">=8.0"
-      }
+    "node_modules/package-json-from-dist": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/package-json-from-dist/-/package-json-from-dist-1.0.1.tgz",
+      "integrity": "sha512-UEZIS3/by4OC8vL3P2dTXRETpebLI2NiI5vIrjaD/5UtrkFX/tNbwjTSRAGC/+7CAo2pIcBaRgWmcBBHcsaCIw=="
     },
-    "node_modules/pngjs": {
-      "version": "3.4.0",
-      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
-      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
+    "node_modules/parent-module": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
+      "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
+      "dev": true,
+      "dependencies": {
+        "callsites": "^3.0.0"
+      },
       "engines": {
-        "node": ">=4.0.0"
+        "node": ">=6"
       }
     },
-    "node_modules/possible-typed-array-names": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
-      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+    "node_modules/parent-module/node_modules/callsites": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
+      "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
+      "dev": true,
       "engines": {
-        "node": ">= 0.4"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss": {
-      "version": "8.4.49",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
-      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "tidelift",
-          "url": "https://tidelift.com/funding/github/npm/postcss"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "node_modules/parse-json": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha512-aOIos8bujGN93/8Ox/jPLh7RwVnPEysynVFE+fQZyg6jKELEHwzgKdLRFHUgXJL6kylijVSBC4BvN9OmsB48Rw==",
       "dependencies": {
-        "nanoid": "^3.3.7",
-        "picocolors": "^1.1.1",
-        "source-map-js": "^1.2.1"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14"
-      }
-    },
-    "node_modules/postcss-calc": {
-      "version": "8.2.4",
-      "resolved": "https://registry.npmjs.org/postcss-calc/-/postcss-calc-8.2.4.tgz",
-      "integrity": "sha512-SmWMSJmB8MRnnULldx0lQIyhSNvuDl9HfrZkaqqE/WHAhToYsAvDq+yAsA/kIyINDszOp3Rh0GFoNuH5Ypsm3Q==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.9",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.2"
+        "node": ">=4"
       }
     },
-    "node_modules/postcss-colormin": {
-      "version": "5.3.1",
-      "resolved": "https://registry.npmjs.org/postcss-colormin/-/postcss-colormin-5.3.1.tgz",
-      "integrity": "sha512-UsWQG0AqTFQmpBegeLLc1+c3jIqBNB0zlDGRWR+dQ3pRKJL1oeMzyqmH3o2PIfn9MBdNrVPWhDbT769LxCTLJQ==",
+    "node_modules/parse-png": {
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/parse-png/-/parse-png-2.1.0.tgz",
+      "integrity": "sha512-Nt/a5SfCLiTnQAjx3fHlqp8hRgTL3z7kTQZzvIMS9uCAepnCyjpdEc6M/sz69WqMBdaDBw9sF1F1UaHROYzGkQ==",
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "colord": "^2.9.1",
-        "postcss-value-parser": "^4.2.0"
+        "pngjs": "^3.3.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=10"
       }
     },
-    "node_modules/postcss-convert-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-convert-values/-/postcss-convert-values-5.1.3.tgz",
-      "integrity": "sha512-82pC1xkJZtcJEfiLw6UXnXVXScgtBrjlO5CBmuDQc+dlb88ZYheFsjTn40+zBVi3DkfF7iezO0nJUPLcJK3pvA==",
+    "node_modules/parse5": {
+      "version": "7.2.1",
+      "resolved": "https://registry.npmjs.org/parse5/-/parse5-7.2.1.tgz",
+      "integrity": "sha512-BuBYQYlv1ckiPdQi/ohiivi9Sagc9JG+Ozs0r7b/0iK3sKmrb0b9FdWdBbOdx6hBCM/F9Ir82ofnBhtZOjCRPQ==",
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "entities": "^4.5.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "funding": {
+        "url": "https://github.com/inikulin/parse5?sponsor=1"
       }
     },
-    "node_modules/postcss-discard-comments": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-discard-comments/-/postcss-discard-comments-5.1.2.tgz",
-      "integrity": "sha512-+L8208OVbHVF2UQf1iDmRcbdjJkuBF6IS29yBDSiWUIzpYaAhtNl6JYnYm12FnkeCwQqF5LeklOu6rAqgfBZqQ==",
+    "node_modules/parseurl": {
+      "version": "1.3.3",
+      "resolved": "https://registry.npmjs.org/parseurl/-/parseurl-1.3.3.tgz",
+      "integrity": "sha512-CiyeOxFT/JZyN5m0z9PfXw4SCBJ6Sygz1Dpl0wqjlhDEGGBP1GnsUVEL0p63hoG1fcj3fHynXi9NYO4nWOL+qQ==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">= 0.8"
       }
     },
-    "node_modules/postcss-discard-duplicates": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-duplicates/-/postcss-discard-duplicates-5.1.0.tgz",
-      "integrity": "sha512-zmX3IoSI2aoenxHV6C7plngHWWhUOV3sP1T8y2ifzxzbtnuhk1EdPwm0S1bIUNaJ2eNbWeGLEwzw8huPD67aQw==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+    "node_modules/password-prompt": {
+      "version": "1.1.3",
+      "resolved": "https://registry.npmjs.org/password-prompt/-/password-prompt-1.1.3.tgz",
+      "integrity": "sha512-HkrjG2aJlvF0t2BMH0e2LB/EHf3Lcq3fNMzy4GYHcQblAvOl+QQji1Lx7WRBMqpVK8p+KR7bCg7oqAMXtdgqyw==",
+      "dependencies": {
+        "ansi-escapes": "^4.3.2",
+        "cross-spawn": "^7.0.3"
       }
     },
-    "node_modules/postcss-discard-empty": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-discard-empty/-/postcss-discard-empty-5.1.1.tgz",
-      "integrity": "sha512-zPz4WljiSuLWsI0ir4Mcnr4qQQ5e1Ukc3i7UfE2XcrwKK2LIPIqE5jxMRxO6GbI3cv//ztXDsXwEWT3BHOGh3A==",
+    "node_modules/path-dirname": {
+      "version": "1.0.2",
+      "resolved": "https://registry.npmjs.org/path-dirname/-/path-dirname-1.0.2.tgz",
+      "integrity": "sha512-ALzNPpyNq9AqXMBjeymIjFDAkAFH06mHJH/cSBHAgU0s4vfpBn6b2nf8tiRLvagKD8RbTpq2FKTBg7cl9l3c7Q==",
+      "dev": true,
+      "license": "MIT"
+    },
+    "node_modules/path-exists": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-4.0.0.tgz",
+      "integrity": "sha512-ak9Qy5Q7jYb2Wwcey5Fpvg2KoAc/ZIhLSLOSBmRmygPsGwkVVt0fZa0qrtMz+m6tJTAHfZQ8FnmB4MG4LWy7/w==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-discard-overridden": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-discard-overridden/-/postcss-discard-overridden-5.1.0.tgz",
-      "integrity": "sha512-21nOL7RqWR1kasIVdKs8HNqQJhFxLsyRfAnUDm4Fe4t4mCWL9OJiHvlHPjcd8zc5Myu89b/7wZDnOSjFgeWRtw==",
+    "node_modules/path-is-absolute": {
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
+      "integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=0.10.0"
       }
     },
-    "node_modules/postcss-import": {
-      "version": "15.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
-      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
-      "dependencies": {
-        "postcss-value-parser": "^4.0.0",
-        "read-cache": "^1.0.0",
-        "resolve": "^1.1.7"
-      },
+    "node_modules/path-key": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/path-key/-/path-key-3.1.1.tgz",
+      "integrity": "sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==",
       "engines": {
-        "node": ">=14.0.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.0.0"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-js": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
-      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
+    "node_modules/path-parse": {
+      "version": "1.0.7",
+      "resolved": "https://registry.npmjs.org/path-parse/-/path-parse-1.0.7.tgz",
+      "integrity": "sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw=="
+    },
+    "node_modules/path-scurry": {
+      "version": "1.11.1",
+      "resolved": "https://registry.npmjs.org/path-scurry/-/path-scurry-1.11.1.tgz",
+      "integrity": "sha512-Xa4Nw17FS9ApQFJ9umLiJS4orGjm7ZzwUrwamcGQuHSzDyth9boKDaycYdDcZDuqYATXw4HFXgaqWTctW/v1HA==",
       "dependencies": {
-        "camelcase-css": "^2.0.1"
+        "lru-cache": "^10.2.0",
+        "minipass": "^5.0.0 || ^6.0.2 || ^7.0.0"
       },
       "engines": {
-        "node": "^12 || ^14 || >= 16"
+        "node": ">=16 || 14 >=14.18"
       },
       "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/postcss/"
-      },
-      "peerDependencies": {
-        "postcss": "^8.4.21"
+        "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/postcss-load-config": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
-      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
-      "dependencies": {
-        "lilconfig": "^3.0.0",
-        "yaml": "^2.3.4"
-      },
+    "node_modules/path-scurry/node_modules/lru-cache": {
+      "version": "10.4.3",
+      "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-10.4.3.tgz",
+      "integrity": "sha512-JNAzZcXrCt42VGLuYz0zfAzDfAvJWW6AfYlDBQyDV5DClI2m5sAmK+OIO7s59XfsRsWHp02jAJrRadPRGTt6SQ=="
+    },
+    "node_modules/path-type": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-4.0.0.tgz",
+      "integrity": "sha512-gDKb8aZMDeD/tZWs9P6+q0J9Mwkdl6xMV8TjnGP3qJVJ06bdMgkbBlLU8IdfOsIsFz2BW1rNVT3XuNEl8zPAvw==",
       "engines": {
-        "node": ">= 14"
-      },
-      "peerDependencies": {
-        "postcss": ">=8.0.9",
-        "ts-node": ">=9.0.0"
-      },
-      "peerDependenciesMeta": {
-        "postcss": {
-          "optional": true
-        },
-        "ts-node": {
-          "optional": true
-        }
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-merge-longhand": {
-      "version": "5.1.7",
-      "resolved": "https://registry.npmjs.org/postcss-merge-longhand/-/postcss-merge-longhand-5.1.7.tgz",
-      "integrity": "sha512-YCI9gZB+PLNskrK0BB3/2OzPnGhPkBEwmwhfYk1ilBHYVAZB7/tkTHFBAnCrvBBOmeYyMYw3DMjT55SyxMBzjQ==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "stylehacks": "^5.1.1"
-      },
+    "node_modules/picocolors": {
+      "version": "1.1.1",
+      "resolved": "https://registry.npmjs.org/picocolors/-/picocolors-1.1.1.tgz",
+      "integrity": "sha512-xceH2snhtb5M9liqDsmEw56le376mTZkEX/jEb/RxNFyegNul7eNslCXP9FDj/Lcu0X8KEyMceP2ntpaHrDEVA=="
+    },
+    "node_modules/picomatch": {
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/picomatch/-/picomatch-3.0.1.tgz",
+      "integrity": "sha512-I3EurrIQMlRc9IaAZnqRR044Phh2DXY+55o7uJ0V+hYZAcQYSuFWsc9q5PvyDHUSCe1Qxn/iBz+78s86zWnGag==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=10"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "funding": {
+        "url": "https://github.com/sponsors/jonschlinkert"
       }
     },
-    "node_modules/postcss-merge-rules": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-merge-rules/-/postcss-merge-rules-5.1.4.tgz",
-      "integrity": "sha512-0R2IuYpgU93y9lhVbO/OylTtKMVcHb67zjWIfCiKR9rWL3GUk1677LAqD/BcHizukdZEjT8Ru3oHRoAYoJy44g==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0",
-        "cssnano-utils": "^3.1.0",
-        "postcss-selector-parser": "^6.0.5"
-      },
+    "node_modules/pify": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+      "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-minify-font-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-minify-font-values/-/postcss-minify-font-values-5.1.0.tgz",
-      "integrity": "sha512-el3mYTgx13ZAPPirSVsHqFzl+BBBDrXvbySvPGFnQcTI4iNslrPaFq4muTkLZmKlGk4gyFAYUBMH30+HurREyA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/pirates": {
+      "version": "4.0.6",
+      "resolved": "https://registry.npmjs.org/pirates/-/pirates-4.0.6.tgz",
+      "integrity": "sha512-saLsH7WeYYPiD25LDuLRRY/i+6HaPYr6G1OUlN39otzkSTxKnubR9RTxS3/Kk50s1g2JTgFwWQDQyplC5/SHZg==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">= 6"
       }
     },
-    "node_modules/postcss-minify-gradients": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-gradients/-/postcss-minify-gradients-5.1.1.tgz",
-      "integrity": "sha512-VGvXMTpCEo4qHTNSa9A0a3D+dxGFZCYwR6Jokk+/3oB6flu2/PnPXAh2x7x52EkY5xlIHLm+Le8tJxe/7TNhzw==",
+    "node_modules/pkg-dir": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/pkg-dir/-/pkg-dir-3.0.0.tgz",
+      "integrity": "sha512-/E57AYkoeQ25qkxMj5PBOVgF8Kiu/h7cYS30Z5+R7WaiCCBfLq58ZI/dSeaEKb9WVJV5n/03QwrN3IeWIFllvw==",
       "dependencies": {
-        "colord": "^2.9.1",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-minify-params": {
-      "version": "5.1.4",
-      "resolved": "https://registry.npmjs.org/postcss-minify-params/-/postcss-minify-params-5.1.4.tgz",
-      "integrity": "sha512-+mePA3MgdmVmv6g+30rn57USjOGSAyuxUmkfiWpzalZ8aiBkdPYjXWtHuwJGm1v5Ojy0Z0LaSYhHaLJQB0P8Jw==",
+    "node_modules/pkg-dir/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-minify-selectors": {
-      "version": "5.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-minify-selectors/-/postcss-minify-selectors-5.2.1.tgz",
-      "integrity": "sha512-nPJu7OjZJTsVUmPdm2TcaiohIwxP+v8ha9NehQ2ye9szv4orirRU3SDdtUmKH+10nzn0bAyOXZ0UEr7OpvLehg==",
+    "node_modules/pkg-dir/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
       "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-modules-extract-imports": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-extract-imports/-/postcss-modules-extract-imports-3.1.0.tgz",
-      "integrity": "sha512-k3kNe0aNFQDAZGbin48pL2VNidTF0w4/eASDsxlyspobzU3wZQLOGj7L9gfRe0Jo9/4uud09DsjFNH7winGv8Q==",
+    "node_modules/pkg-dir/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dependencies": {
+        "p-try": "^2.0.0"
+      },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
+        "node": ">=6"
       },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-modules-local-by-default": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-local-by-default/-/postcss-modules-local-by-default-4.2.0.tgz",
-      "integrity": "sha512-5kcJm/zk+GJDSfw+V/42fJ5fhjL5YbFDl8nVdXkJPLLW+Vf9mTD5Xe0wqIaDnLuL2U6cDNpTr+UQ+v2HWIBhzw==",
+    "node_modules/pkg-dir/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
       "dependencies": {
-        "icss-utils": "^5.0.0",
-        "postcss-selector-parser": "^7.0.0",
-        "postcss-value-parser": "^4.1.0"
+        "p-limit": "^2.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-modules-local-by-default/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
-      "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
-      },
+    "node_modules/pkg-dir/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
       "engines": {
         "node": ">=4"
       }
     },
-    "node_modules/postcss-modules-scope": {
-      "version": "3.2.1",
-      "resolved": "https://registry.npmjs.org/postcss-modules-scope/-/postcss-modules-scope-3.2.1.tgz",
-      "integrity": "sha512-m9jZstCVaqGjTAuny8MdgE88scJnCiQSlSrOWcTQgM2t32UBe+MUmFSO5t7VMSfAf/FJKImAxBav8ooCHJXCJA==",
+    "node_modules/pkg-up": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/pkg-up/-/pkg-up-3.1.0.tgz",
+      "integrity": "sha512-nDywThFk1i4BQK4twPQ6TA4RT8bDY96yeuCVBWL3ePARCiEKDRSrNGbFIgUJpLp+XeIR65v8ra7WuJOFUBtkMA==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^7.0.0"
+        "find-up": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=8"
       }
     },
-    "node_modules/postcss-modules-scope/node_modules/postcss-selector-parser": {
-      "version": "7.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-selector-parser/-/postcss-selector-parser-7.1.0.tgz",
-      "integrity": "sha512-8sLjZwK0R+JlxlYcTuVnyT2v+htpdrjDOKuMcOVdYjt52Lh8hWRYpxBPoKx/Zg+bcjc3wx6fmQevMmUztS/ccA==",
+    "node_modules/pkg-up/node_modules/find-up": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/find-up/-/find-up-3.0.0.tgz",
+      "integrity": "sha512-1yD6RmLI1XBfxugvORwlck6f75tYL+iR0jqwsOrOxMZyGYqUuDhJ0l4AXdO1iX/FTs9cBAMEk1gWSEx1kSbylg==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "cssesc": "^3.0.0",
-        "util-deprecate": "^1.0.2"
+        "locate-path": "^3.0.0"
       },
       "engines": {
-        "node": ">=4"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-modules-values": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/postcss-modules-values/-/postcss-modules-values-4.0.0.tgz",
-      "integrity": "sha512-RDxHkAiEGI78gS2ofyvCsu7iycRv7oqw5xMWn9iMoR0N/7mf9D50ecQqUo5BZ9Zh2vH4bCUR/ktCqbB9m8vJjQ==",
+    "node_modules/pkg-up/node_modules/locate-path": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-3.0.0.tgz",
+      "integrity": "sha512-7AO748wWnIhNqAuaty2ZWHkQHRSNfPVIsPIfwEOWO22AmaoVrWavlOcMR5nzTLNYvp36X220/maaRsrec1G65A==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "icss-utils": "^5.0.0"
+        "p-locate": "^3.0.0",
+        "path-exists": "^3.0.0"
       },
       "engines": {
-        "node": "^10 || ^12 || >= 14"
-      },
-      "peerDependencies": {
-        "postcss": "^8.1.0"
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-nested": {
-      "version": "6.2.0",
-      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
-      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
-      "funding": [
-        {
-          "type": "opencollective",
-          "url": "https://opencollective.com/postcss/"
-        },
-        {
-          "type": "github",
-          "url": "https://github.com/sponsors/ai"
-        }
-      ],
+    "node_modules/pkg-up/node_modules/p-limit": {
+      "version": "2.3.0",
+      "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-2.3.0.tgz",
+      "integrity": "sha512-//88mFWSJx8lxCzwdAABTJL2MyWB12+eIY7MDL2SqLmAkeKU9qxRvWuSyTjm3FUmpBEMuFfckAIqEaVGUDxb6w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "postcss-selector-parser": "^6.1.1"
+        "p-try": "^2.0.0"
       },
       "engines": {
-        "node": ">=12.0"
+        "node": ">=6"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.14"
+      "funding": {
+        "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/postcss-normalize-charset": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-charset/-/postcss-normalize-charset-5.1.0.tgz",
-      "integrity": "sha512-mSgUJ+pd/ldRGVx26p2wz9dNZ7ji6Pn8VWBajMXFf8jk7vUoSrZ2lt/wZR7DtlZYKesmZI680qjr2CeFF2fbUg==",
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
+    "node_modules/pkg-up/node_modules/p-locate": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-3.0.0.tgz",
+      "integrity": "sha512-x+12w/To+4GFfgJhBEpiDcLozRJGegY+Ei7/z0tSLkMmxGZNybVMSfWj9aJn8Z5Fc7dBUNJOOVgPv2H7IwulSQ==",
+      "dev": true,
+      "license": "MIT",
+      "dependencies": {
+        "p-limit": "^2.0.0"
       },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+      "engines": {
+        "node": ">=6"
       }
     },
-    "node_modules/postcss-normalize-display-values": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-display-values/-/postcss-normalize-display-values-5.1.0.tgz",
-      "integrity": "sha512-WP4KIM4o2dazQXWmFaqMmcvsKmhdINFblgSeRgn8BJ6vxaMyaJkwAzpPpuvSIoG/rmX3M+IrRZEz2H0glrQNEA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/pkg-up/node_modules/path-exists": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-3.0.0.tgz",
+      "integrity": "sha512-bpC7GYwiDYQ4wYLe+FA8lhRjhQCMcQGuSgGGqDkg/QerRWw9CmGRT0iSOVRSZJ29NMLZgIzqaljJ63oaL4NIJQ==",
+      "dev": true,
+      "license": "MIT",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=4"
       }
     },
-    "node_modules/postcss-normalize-positions": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-positions/-/postcss-normalize-positions-5.1.1.tgz",
-      "integrity": "sha512-6UpCb0G4eofTCQLFVuI3EVNZzBNPiIKcA1AKVka+31fTVySphr3VUgAIULBhxZkKgwLImhzMR2Bw1ORK+37INg==",
+    "node_modules/plist": {
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/plist/-/plist-3.1.0.tgz",
+      "integrity": "sha512-uysumyrvkUX0rX/dEVqt8gC3sTBzd4zoWfLeS29nb53imdaXVvLINYXTI2GNqzaMuvacNx4uJQ8+b3zXR0pkgQ==",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "@xmldom/xmldom": "^0.8.8",
+        "base64-js": "^1.5.1",
+        "xmlbuilder": "^15.1.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=10.4.0"
       }
     },
-    "node_modules/postcss-normalize-repeat-style": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.1.1.tgz",
-      "integrity": "sha512-mFpLspGWkQtBcWIRFLmewo8aC3ImN2i/J3v8YCFUwDnPu3Xz4rLohDO26lGjwNsQxB3YF0KKRwspGzE2JEuS0g==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/plist/node_modules/@xmldom/xmldom": {
+      "version": "0.8.10",
+      "resolved": "https://registry.npmjs.org/@xmldom/xmldom/-/xmldom-0.8.10.tgz",
+      "integrity": "sha512-2WALfTl4xo2SkGCYRt6rDTFfk9R1czmBvUQy12gK2KuRKIpWEhcbbzy8EZXtz/jkRqHX8bFEc6FC1HjX4TUWYw==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=10.0.0"
       }
     },
-    "node_modules/postcss-normalize-string": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-string/-/postcss-normalize-string-5.1.0.tgz",
-      "integrity": "sha512-oYiIJOf4T9T1N4i+abeIc7Vgm/xPCGih4bZz5Nm0/ARVJ7K6xrDlLwvwqOydvyL3RHNf8qZk6vo3aatiw/go3w==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/plist/node_modules/xmlbuilder": {
+      "version": "15.1.1",
+      "resolved": "https://registry.npmjs.org/xmlbuilder/-/xmlbuilder-15.1.1.tgz",
+      "integrity": "sha512-yMqGBqtXyeN1e3TGYvgNgDVZ3j84W4cwkOXQswghol6APgZWaff9lnbvN7MHYJOiXsvGPXtjTYJEiC9J2wv9Eg==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=8.0"
       }
     },
-    "node_modules/postcss-normalize-timing-functions": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.1.0.tgz",
-      "integrity": "sha512-DOEkzJ4SAXv5xkHl0Wa9cZLF3WCBhF3o1SKVxKQAa+0pYKlueTpCgvkFAHfk+Y64ezX9+nITGrDZeVGgITJXjg==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/pngjs": {
+      "version": "3.4.0",
+      "resolved": "https://registry.npmjs.org/pngjs/-/pngjs-3.4.0.tgz",
+      "integrity": "sha512-NCrCHhWmnQklfH4MtJMRjZ2a8c80qXeMlQMv2uVp9ISJMTt562SbGd6n2oq0PaPgKm7Z6pL9E2UlLIhC+SHL3w==",
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">=4.0.0"
       }
     },
-    "node_modules/postcss-normalize-unicode": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-unicode/-/postcss-normalize-unicode-5.1.1.tgz",
-      "integrity": "sha512-qnCL5jzkNUmKVhZoENp1mJiGNPcsJCs1aaRmURmeJGES23Z/ajaln+EPTD+rBeNkSryI+2WTdW+lwcVdOikrpA==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-value-parser": "^4.2.0"
-      },
+    "node_modules/possible-typed-array-names": {
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/possible-typed-array-names/-/possible-typed-array-names-1.1.0.tgz",
+      "integrity": "sha512-/+5VFTchJDoVj3bhoqi6UeymcD00DAwb1nJwamzPvHEszJ4FpF6SNNbUbOS8yI56qHzdV8eK0qEfOSiodkTdxg==",
+      "dev": true,
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": ">= 0.4"
       }
     },
-    "node_modules/postcss-normalize-url": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-url/-/postcss-normalize-url-5.1.0.tgz",
-      "integrity": "sha512-5upGeDO+PVthOxSmds43ZeMeZfKH+/DKgGRD7TElkkyS46JXAUhMzIKiCa7BabPeIy3AQcTkXwVVN7DbqsiCew==",
+    "node_modules/postcss": {
+      "version": "8.4.49",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.49.tgz",
+      "integrity": "sha512-OCVPnIObs4N29kxTjzLfUryOkvZEq+pf8jTF0lg8E7uETuWHA+v7j3c/xJmiqpX450191LlmZfUKkXxkTry7nA==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "tidelift",
+          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "normalize-url": "^6.0.1",
-        "postcss-value-parser": "^4.2.0"
+        "nanoid": "^3.3.7",
+        "picocolors": "^1.1.1",
+        "source-map-js": "^1.2.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
+        "node": "^10 || ^12 || >=14"
       }
     },
-    "node_modules/postcss-normalize-whitespace": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.1.1.tgz",
-      "integrity": "sha512-83ZJ4t3NUDETIHTa3uEg6asWjSBYL5EdkVB0sDncx9ERzOKBVJIUeDO9RyA9Zwtig8El1d79HBp0JEi8wvGQnA==",
+    "node_modules/postcss-import": {
+      "version": "15.1.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-15.1.0.tgz",
+      "integrity": "sha512-hpr+J05B2FVYUAXHeK1YyI267J/dDDhMU6B6civm8hSY1jYJnBXxzKDKDswzJmtLHryrjhnDjqqp/49t8FALew==",
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss-value-parser": "^4.0.0",
+        "read-cache": "^1.0.0",
+        "resolve": "^1.1.7"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=14.0.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.0.0"
       }
     },
-    "node_modules/postcss-ordered-values": {
-      "version": "5.1.3",
-      "resolved": "https://registry.npmjs.org/postcss-ordered-values/-/postcss-ordered-values-5.1.3.tgz",
-      "integrity": "sha512-9UO79VUhPwEkzbb3RNpqqghc6lcYej1aveQteWY+4POIwlqkYE21HKWaLDF6lWNuqCobEAyTovVhtI32Rbv2RQ==",
+    "node_modules/postcss-js": {
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/postcss-js/-/postcss-js-4.0.1.tgz",
+      "integrity": "sha512-dDLF8pEO191hJMtlHFPRa8xsizHaM82MLfNkUHdUtVEV3tgTp5oj+8qbEqYM57SLfc74KSbw//4SeJma2LRVIw==",
       "dependencies": {
-        "cssnano-utils": "^3.1.0",
-        "postcss-value-parser": "^4.2.0"
+        "camelcase-css": "^2.0.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": "^12 || ^14 || >= 16"
+      },
+      "funding": {
+        "type": "opencollective",
+        "url": "https://opencollective.com/postcss/"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.4.21"
       }
     },
-    "node_modules/postcss-reduce-initial": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-initial/-/postcss-reduce-initial-5.1.2.tgz",
-      "integrity": "sha512-dE/y2XRaqAi6OvjzD22pjTUQ8eOfc6m/natGHgKFBK9DxFmIm69YmaRVQrGgFlEfc1HePIurY0TmDeROK05rIg==",
+    "node_modules/postcss-load-config": {
+      "version": "4.0.2",
+      "resolved": "https://registry.npmjs.org/postcss-load-config/-/postcss-load-config-4.0.2.tgz",
+      "integrity": "sha512-bSVhyJGL00wMVoPUzAVAnbEoWyqRxkjv64tUl427SKnPrENtq6hJwUojroMz2VB+Q1edmi4IfrAPpami5VVgMQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "browserslist": "^4.21.4",
-        "caniuse-api": "^3.0.0"
+        "lilconfig": "^3.0.0",
+        "yaml": "^2.3.4"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">= 14"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": ">=8.0.9",
+        "ts-node": ">=9.0.0"
+      },
+      "peerDependenciesMeta": {
+        "postcss": {
+          "optional": true
+        },
+        "ts-node": {
+          "optional": true
+        }
       }
     },
-    "node_modules/postcss-reduce-transforms": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-reduce-transforms/-/postcss-reduce-transforms-5.1.0.tgz",
-      "integrity": "sha512-2fbdbmgir5AvpW9RLtdONx1QoYG2/EtqpNQbFASDlixBbAYuTcJ0dECwlqNqH7VbaUnEnh8SrxOe2sRIn24XyQ==",
+    "node_modules/postcss-nested": {
+      "version": "6.2.0",
+      "resolved": "https://registry.npmjs.org/postcss-nested/-/postcss-nested-6.2.0.tgz",
+      "integrity": "sha512-HQbt28KulC5AJzG+cZtj9kvKB93CFCdLvog1WFLf1D+xmMvPGlBstkpTEZfK5+AN9hfJocyBFCNiqyS48bpgzQ==",
+      "funding": [
+        {
+          "type": "opencollective",
+          "url": "https://opencollective.com/postcss/"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
       "dependencies": {
-        "postcss-value-parser": "^4.2.0"
+        "postcss-selector-parser": "^6.1.1"
       },
       "engines": {
-        "node": "^10 || ^12 || >=14.0"
+        "node": ">=12.0"
       },
       "peerDependencies": {
-        "postcss": "^8.2.15"
+        "postcss": "^8.2.14"
       }
     },
     "node_modules/postcss-selector-parser": {
@@ -18485,129 +13748,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/postcss-svgo": {
-      "version": "5.1.0",
-      "resolved": "https://registry.npmjs.org/postcss-svgo/-/postcss-svgo-5.1.0.tgz",
-      "integrity": "sha512-D75KsH1zm5ZrHyxPakAxJWtkyXew5qwS70v56exwvw542d9CRtTo78K0WeFxZB4G7JXKKMbEZtZayTGdIky/eA==",
-      "dependencies": {
-        "postcss-value-parser": "^4.2.0",
-        "svgo": "^2.7.0"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/csso": {
-      "version": "4.2.0",
-      "resolved": "https://registry.npmjs.org/csso/-/csso-4.2.0.tgz",
-      "integrity": "sha512-wvlcdIbf6pwKEk7vHj8/Bkc0B4ylXZruLvOgs9doS5eOsOpuodOV2zJChSpkp+pRpYQLQMeF04nr3Z68Sta9jA==",
-      "dependencies": {
-        "css-tree": "^1.1.2"
-      },
-      "engines": {
-        "node": ">=8.0.0"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/postcss-svgo/node_modules/svgo": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/svgo/-/svgo-2.8.0.tgz",
-      "integrity": "sha512-+N/Q9kV1+F+UeWYoSiULYo4xYSDQlTgb+ayMobAXPwMnLvop7oxKMo9OzIrX5x3eS4L4f2UHhc9axXwY8DpChg==",
-      "dependencies": {
-        "@trysound/sax": "0.2.0",
-        "commander": "^7.2.0",
-        "css-select": "^4.1.3",
-        "css-tree": "^1.1.3",
-        "csso": "^4.2.0",
-        "picocolors": "^1.0.0",
-        "stable": "^0.1.8"
-      },
-      "bin": {
-        "svgo": "bin/svgo"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
-    "node_modules/postcss-unique-selectors": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/postcss-unique-selectors/-/postcss-unique-selectors-5.1.1.tgz",
-      "integrity": "sha512-5JiODlELrz8L2HwxfPnhOWZYWDxVHWL83ufOv84NrcgipI7TaeRsatAhK4Tr2/ZiYldpK/wBvw5BD3qfaK96GA==",
-      "dependencies": {
-        "postcss-selector-parser": "^6.0.5"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
     "node_modules/postcss-value-parser": {
       "version": "4.2.0",
       "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-4.2.0.tgz",
@@ -18648,15 +13788,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/pretty-error": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/pretty-error/-/pretty-error-4.0.0.tgz",
-      "integrity": "sha512-AoJ5YMAcXKYxKhuJGdcvse+Voc6v1RgnsR3nWcYU7q4t6z0Q6T86sv5Zq8VIRbOWWFpvdGE83LtdSMNd+6Y0xw==",
-      "dependencies": {
-        "lodash": "^4.17.20",
-        "renderkid": "^3.0.0"
-      }
-    },
     "node_modules/pretty-format": {
       "version": "29.7.0",
       "resolved": "https://registry.npmjs.org/pretty-format/-/pretty-format-29.7.0.tgz",
@@ -18689,19 +13820,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/process": {
-      "version": "0.11.10",
-      "resolved": "https://registry.npmjs.org/process/-/process-0.11.10.tgz",
-      "integrity": "sha512-cdGef/drWFoydD1JsMzuFf8100nZl+GT+yacc2bEced5f9Rjk4z+WtFUTBu9PhOi9j/jfmBPu0mMEY4wIdAF8A==",
-      "engines": {
-        "node": ">= 0.6.0"
-      }
-    },
-    "node_modules/process-nextick-args": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
-    },
     "node_modules/progress": {
       "version": "2.0.3",
       "resolved": "https://registry.npmjs.org/progress/-/progress-2.0.3.tgz",
@@ -18718,12 +13836,6 @@
         "asap": "~2.0.3"
       }
     },
-    "node_modules/promise-inflight": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/promise-inflight/-/promise-inflight-1.0.1.tgz",
-      "integrity": "sha512-6zWPyEOFaQBJYcGMHBKTKJ3u6TBsnMFOIZSa6ce1e/ZrrsOlnHRHbabMjLiBYKp+n44X9eUI6VUPaukCXHuG4g==",
-      "peer": true
-    },
     "node_modules/prompts": {
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/prompts/-/prompts-2.4.2.tgz",
@@ -18751,28 +13863,11 @@
       "resolved": "https://registry.npmjs.org/react-is/-/react-is-16.13.1.tgz",
       "integrity": "sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ=="
     },
-    "node_modules/proxy-addr": {
-      "version": "2.0.7",
-      "resolved": "https://registry.npmjs.org/proxy-addr/-/proxy-addr-2.0.7.tgz",
-      "integrity": "sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==",
-      "dependencies": {
-        "forwarded": "0.2.0",
-        "ipaddr.js": "1.9.1"
-      },
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/proxy-from-env": {
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz",
       "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg=="
     },
-    "node_modules/prr": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/prr/-/prr-1.0.1.tgz",
-      "integrity": "sha512-yPw4Sng1gWghHQWj0B3ZggWUm4qVbPwPFcRG8KyxiU7J2OHFSoEHKS+EZ3fv5l1t9CyCiop6l/ZYeWbrgoQejw=="
-    },
     "node_modules/psl": {
       "version": "1.15.0",
       "resolved": "https://registry.npmjs.org/psl/-/psl-1.15.0.tgz",
@@ -18824,20 +13919,6 @@
         "qrcode-terminal": "bin/qrcode-terminal.js"
       }
     },
-    "node_modules/qs": {
-      "version": "6.13.0",
-      "resolved": "https://registry.npmjs.org/qs/-/qs-6.13.0.tgz",
-      "integrity": "sha512-+38qI9SOr8tfZ4QmJNplMUxqjbe7LKvvZgWdExBOmd+egZTtjLB67Gu0HRX3u/XOq7UU2Nx6nsjvS16Z9uwfpg==",
-      "dependencies": {
-        "side-channel": "^1.0.6"
-      },
-      "engines": {
-        "node": ">=0.6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/query-string": {
       "version": "7.1.3",
       "resolved": "https://registry.npmjs.org/query-string/-/query-string-7.1.3.tgz",
@@ -18856,23 +13937,6 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/querystring": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/querystring/-/querystring-0.2.0.tgz",
-      "integrity": "sha512-X/xY82scca2tau62i9mDyU9K+I+djTMUsvwf7xnUX5GLvVzgJybOJf4Y6o9Zx3oJK/LSXg5tTZBjwzqVPaPO2g==",
-      "deprecated": "The querystring API is considered Legacy. new code should use the URLSearchParams API instead.",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/querystring-es3": {
-      "version": "0.2.1",
-      "resolved": "https://registry.npmjs.org/querystring-es3/-/querystring-es3-0.2.1.tgz",
-      "integrity": "sha512-773xhDQnZBMFobEiztv8LIl70ch5MSF/jUQVlhwFyBILqq96anmoctVIYz+ZRp0qbCKATTn6ev02M3r7Ga5vqA==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
     "node_modules/querystringify": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/querystringify/-/querystringify-2.2.0.tgz",
@@ -18909,6 +13973,7 @@
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
       "integrity": "sha512-vYl3iOX+4CKUWuxGi9Ukhie6fsqXqS9FE2Zaic4tNFD2N2QQaXOMFbuKK4QmDHC0JO6B1Zp41J0LpT0oR68amQ==",
+      "peer": true,
       "dependencies": {
         "safe-buffer": "^5.1.0"
       }
@@ -18921,31 +13986,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/raw-body": {
-      "version": "2.5.2",
-      "resolved": "https://registry.npmjs.org/raw-body/-/raw-body-2.5.2.tgz",
-      "integrity": "sha512-8zGqypfENjCIqGhgXToC8aB2r7YrBX+AQAfIPs/Mlk+BtPTztOvTS01NRW/3Eh60J+a48lt8qsCzirQ6loCVfA==",
-      "dependencies": {
-        "bytes": "3.1.2",
-        "http-errors": "2.0.0",
-        "iconv-lite": "0.4.24",
-        "unpipe": "1.0.0"
-      },
-      "engines": {
-        "node": ">= 0.8"
-      }
-    },
-    "node_modules/raw-body/node_modules/iconv-lite": {
-      "version": "0.4.24",
-      "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.24.tgz",
-      "integrity": "sha512-v3MXnZAcvnywkTUEZomIActle7RXXeedOR31wwl7VlyoXO4Qi9arvSenNQWne1TcRwhCL1HwLI21bEqdpj8/rA==",
-      "dependencies": {
-        "safer-buffer": ">= 2.1.2 < 3"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/rc": {
       "version": "1.2.8",
       "resolved": "https://registry.npmjs.org/rc/-/rc-1.2.8.tgz",
@@ -19430,18 +14470,6 @@
         "react-native": ">=0.73.0"
       }
     },
-    "node_modules/react-native-level-fs": {
-      "version": "3.0.1",
-      "resolved": "https://registry.npmjs.org/react-native-level-fs/-/react-native-level-fs-3.0.1.tgz",
-      "integrity": "sha512-ffihv0Obh2zGFcpHHDlq7bQHfGPwgtmZ4No1tx9jAJF69vkQS6TI93AE2FK2qP7tsDg0DNSnn+KuJoriYilJNA==",
-      "dependencies": {
-        "level-filesystem": "^1.0.1",
-        "levelup": "^0.18.2"
-      },
-      "peerDependencies": {
-        "asyncstorage-down": ">=3.0.0 <5.0.0"
-      }
-    },
     "node_modules/react-native-maps": {
       "version": "1.18.0",
       "resolved": "https://registry.npmjs.org/react-native-maps/-/react-native-maps-1.18.0.tgz",
@@ -19464,11 +14492,6 @@
         }
       }
     },
-    "node_modules/react-native-os": {
-      "version": "1.2.6",
-      "resolved": "https://registry.npmjs.org/react-native-os/-/react-native-os-1.2.6.tgz",
-      "integrity": "sha512-OlT+xQAcvkcnf7imgXiu+myMkqDt4xw2bP5SlVo19hEn5XHBkPMLX7dk3sSGxxncH/ToMDsf1KLyrPabNVtadA=="
-    },
     "node_modules/react-native-pager-view": {
       "version": "6.7.0",
       "resolved": "https://registry.npmjs.org/react-native-pager-view/-/react-native-pager-view-6.7.0.tgz",
@@ -19532,128 +14555,43 @@
       "license": "MIT",
       "dependencies": {
         "css-select": "^5.1.0",
-        "css-tree": "^1.1.3",
-        "warn-once": "0.1.1"
-      },
-      "peerDependencies": {
-        "react": "*",
-        "react-native": "*"
-      }
-    },
-    "node_modules/react-native-svg-transformer": {
-      "version": "1.5.0",
-      "resolved": "https://registry.npmjs.org/react-native-svg-transformer/-/react-native-svg-transformer-1.5.0.tgz",
-      "integrity": "sha512-RG5fSWJT7mjCQYocgYFUo1KYPLOoypPVG5LQab+pZZO7m4ciGaQIe0mhok3W4R5jLQsEXKo0u+aQGkZV/bZG7w==",
-      "dev": true,
-      "license": "MIT",
-      "dependencies": {
-        "@svgr/core": "^8.1.0",
-        "@svgr/plugin-jsx": "^8.1.0",
-        "@svgr/plugin-svgo": "^8.1.0",
-        "path-dirname": "^1.0.2"
-      },
-      "peerDependencies": {
-        "react-native": ">=0.59.0",
-        "react-native-svg": ">=12.0.0"
-      }
-    },
-    "node_modules/react-native-swipe-gestures": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
-      "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw==",
-      "license": "MIT"
-    },
-    "node_modules/react-native-tcp": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/react-native-tcp/-/react-native-tcp-3.3.2.tgz",
-      "integrity": "sha512-zjFmjAvYOsBkR1MF7htuPlk+uOzTykKaeu/eN+I7fkZ7UqBCW+9u/gJgWCv6Tjfn2tGgku6hsEWril4Oy3zJhg==",
-      "dependencies": {
-        "base64-js": "0.0.8",
-        "buffer": "^5.0.0",
-        "events": "^1.0.2",
-        "ip-regex": "^1.0.3",
-        "process": "^0.11.9",
-        "util": "^0.10.3"
-      },
-      "peerDependencies": {
-        "react-native": ">=0.40.0"
-      }
-    },
-    "node_modules/react-native-tcp/node_modules/base64-js": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/react-native-tcp/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/react-native-tcp/node_modules/ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/react-native-udp": {
-      "version": "2.7.0",
-      "resolved": "https://registry.npmjs.org/react-native-udp/-/react-native-udp-2.7.0.tgz",
-      "integrity": "sha512-tT+Wn0yLbdaTohXkGGor0HYgScGaASWCaCLSO1kCIUdNke7AtcOX5a5nfNLYrEjdUn7/2HRofuplyky7iJHSQA==",
-      "dependencies": {
-        "base64-js": "0.0.8",
-        "events": "^1.0.2",
-        "inherits": "^2.0.1",
-        "ip-regex": "^1.0.3",
-        "util": "^0.10.3"
-      }
-    },
-    "node_modules/react-native-udp/node_modules/base64-js": {
-      "version": "0.0.8",
-      "resolved": "https://registry.npmjs.org/base64-js/-/base64-js-0.0.8.tgz",
-      "integrity": "sha512-3XSA2cR/h/73EzlXXdU6YNycmYI7+kicTxks4eJg2g39biHR84slg2+des+p7iHYhbRg/udIS4TD53WabcOUkw==",
-      "engines": {
-        "node": ">= 0.4"
-      }
-    },
-    "node_modules/react-native-udp/node_modules/events": {
-      "version": "1.1.1",
-      "resolved": "https://registry.npmjs.org/events/-/events-1.1.1.tgz",
-      "integrity": "sha512-kEcvvCBByWXGnZy6JUlgAp2gBIUjfCAV6P6TgT1/aaQKcmuAEC4OZTV1I4EWQLz2gxZw76atuVyvHhTxvi0Flw==",
-      "engines": {
-        "node": ">=0.4.x"
-      }
-    },
-    "node_modules/react-native-udp/node_modules/ip-regex": {
-      "version": "1.0.3",
-      "resolved": "https://registry.npmjs.org/ip-regex/-/ip-regex-1.0.3.tgz",
-      "integrity": "sha512-HjpCHTuxbR/6jWJroc/VN+npo5j0T4Vv2TAI5qdEHQx7hsL767MeccGFSsLtF694EiZKTSEqgoeU6DtGFCcuqQ==",
-      "engines": {
-        "node": ">=0.10.0"
+        "css-tree": "^1.1.3",
+        "warn-once": "0.1.1"
+      },
+      "peerDependencies": {
+        "react": "*",
+        "react-native": "*"
       }
     },
-    "node_modules/react-native-url-polyfill": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/react-native-url-polyfill/-/react-native-url-polyfill-1.3.0.tgz",
-      "integrity": "sha512-w9JfSkvpqqlix9UjDvJjm1EjSt652zVQ6iwCIj1cVVkwXf4jQhQgTNXY6EVTwuAmUjg6BC6k9RHCBynoLFo3IQ==",
+    "node_modules/react-native-svg-transformer": {
+      "version": "1.5.0",
+      "resolved": "https://registry.npmjs.org/react-native-svg-transformer/-/react-native-svg-transformer-1.5.0.tgz",
+      "integrity": "sha512-RG5fSWJT7mjCQYocgYFUo1KYPLOoypPVG5LQab+pZZO7m4ciGaQIe0mhok3W4R5jLQsEXKo0u+aQGkZV/bZG7w==",
+      "dev": true,
+      "license": "MIT",
       "dependencies": {
-        "whatwg-url-without-unicode": "8.0.0-3"
+        "@svgr/core": "^8.1.0",
+        "@svgr/plugin-jsx": "^8.1.0",
+        "@svgr/plugin-svgo": "^8.1.0",
+        "path-dirname": "^1.0.2"
       },
       "peerDependencies": {
-        "react-native": "*"
+        "react-native": ">=0.59.0",
+        "react-native-svg": ">=12.0.0"
       }
     },
+    "node_modules/react-native-swipe-gestures": {
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/react-native-swipe-gestures/-/react-native-swipe-gestures-1.0.5.tgz",
+      "integrity": "sha512-Ns7Bn9H/Tyw278+5SQx9oAblDZ7JixyzeOczcBK8dipQk2pD7Djkcfnf1nB/8RErAmMLL9iXgW0QHqiII8AhKw==",
+      "license": "MIT"
+    },
     "node_modules/react-native-web": {
       "version": "0.19.13",
       "resolved": "https://registry.npmjs.org/react-native-web/-/react-native-web-0.19.13.tgz",
       "integrity": "sha512-etv3bN8rJglrRCp/uL4p7l8QvUNUC++QwDbdZ8CB7BvZiMvsxfFIRM1j04vxNldG3uo2puRd6OSWR3ibtmc29A==",
+      "optional": true,
+      "peer": true,
       "dependencies": {
         "@babel/runtime": "^7.18.6",
         "@react-native/normalize-colors": "^0.74.1",
@@ -19672,12 +14610,16 @@
     "node_modules/react-native-web/node_modules/@react-native/normalize-colors": {
       "version": "0.74.89",
       "resolved": "https://registry.npmjs.org/@react-native/normalize-colors/-/normalize-colors-0.74.89.tgz",
-      "integrity": "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg=="
+      "integrity": "sha512-qoMMXddVKVhZ8PA1AbUCk83trpd6N+1nF2A6k1i6LsQObyS92fELuk8kU/lQs6M7BsMHwqyLCpQJ1uFgNvIQXg==",
+      "optional": true,
+      "peer": true
     },
     "node_modules/react-native-web/node_modules/memoize-one": {
       "version": "6.0.0",
       "resolved": "https://registry.npmjs.org/memoize-one/-/memoize-one-6.0.0.tgz",
-      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw=="
+      "integrity": "sha512-rkpe71W0N0c0Xz6QD0eJETuWAJGnJ9afsl1srmwPrI+yBCkge5EycXXbYRyvL29zZVUWQCY7InPRCv3GDXuZNw==",
+      "optional": true,
+      "peer": true
     },
     "node_modules/react-native/node_modules/babel-plugin-syntax-hermes-parser": {
       "version": "0.23.1",
@@ -19827,22 +14769,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/readable-stream": {
-      "version": "1.1.14",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-1.1.14.tgz",
-      "integrity": "sha512-+MeVjFf4L44XUkhM1eYbD8fyEsxcV81pqMSR5gblfcLCHfZvbrqy4/qYHE+/R5HoBUT11WV5O08Cr1n3YXkWVQ==",
-      "dependencies": {
-        "core-util-is": "~1.0.0",
-        "inherits": "~2.0.1",
-        "isarray": "0.0.1",
-        "string_decoder": "~0.10.x"
-      }
-    },
-    "node_modules/readable-stream/node_modules/isarray": {
-      "version": "0.0.1",
-      "resolved": "https://registry.npmjs.org/isarray/-/isarray-0.0.1.tgz",
-      "integrity": "sha512-D2S+3GLxWH+uhrNEcoh/fnmYeP8E8/zHl644d/jdA0g2uyXvy3sb0qxotE+ne0LtccHknQzWwZEzhak7oJ0COQ=="
-    },
     "node_modules/readdirp": {
       "version": "3.6.0",
       "resolved": "https://registry.npmjs.org/readdirp/-/readdirp-3.6.0.tgz",
@@ -19939,6 +14865,7 @@
       "version": "1.0.10",
       "resolved": "https://registry.npmjs.org/reflect.getprototypeof/-/reflect.getprototypeof-1.0.10.tgz",
       "integrity": "sha512-00o4I+DVrefhv+nX0ulyi3biSHCPDe+yLv5o/p6d/UVlirijB8E16FtfwSAi4g3tcqrQ4lRAqQSoFEZJehYEcw==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -19989,6 +14916,7 @@
       "version": "1.5.4",
       "resolved": "https://registry.npmjs.org/regexp.prototype.flags/-/regexp.prototype.flags-1.5.4.tgz",
       "integrity": "sha512-dYqgNSZbDwkaJ2ceRd9ojCGjBq+mOm9LmtXnAnEGyHhN/5R7iDW2TRw3h+o/jCFxus3P2LfWIIiwowAjANm7IA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "define-properties": "^1.2.1",
@@ -20020,26 +14948,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/registry-auth-token": {
-      "version": "3.3.2",
-      "resolved": "https://registry.npmjs.org/registry-auth-token/-/registry-auth-token-3.3.2.tgz",
-      "integrity": "sha512-JL39c60XlzCVgNrO+qq68FoNb56w/m7JYvGR2jT5iR1xBrUA3Mfx5Twk5rqTThPmQKMWydGmq8oFtDlxfrmxnQ==",
-      "dependencies": {
-        "rc": "^1.1.6",
-        "safe-buffer": "^5.0.1"
-      }
-    },
-    "node_modules/registry-url": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/registry-url/-/registry-url-3.1.0.tgz",
-      "integrity": "sha512-ZbgR5aZEdf4UKZVBPYIgaglBmSF2Hi94s2PcIHhRGFjKYu+chjJdYfHn4rt3hB6eCKLJ8giVIIfgMa1ehDfZKA==",
-      "dependencies": {
-        "rc": "^1.0.1"
-      },
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
     "node_modules/regjsgen": {
       "version": "0.8.0",
       "resolved": "https://registry.npmjs.org/regjsgen/-/regjsgen-0.8.0.tgz",
@@ -20067,105 +14975,11 @@
         "node": ">=6"
       }
     },
-    "node_modules/relateurl": {
-      "version": "0.2.7",
-      "resolved": "https://registry.npmjs.org/relateurl/-/relateurl-0.2.7.tgz",
-      "integrity": "sha512-G08Dxvm4iDN3MLM0EsP62EDV9IuhXPR6blNz6Utcp7zyV3tr4HVNINt6MpaRWbxoOHT3Q7YN2P+jaHX8vUbgog==",
-      "engines": {
-        "node": ">= 0.10"
-      }
-    },
     "node_modules/remove-trailing-slash": {
       "version": "0.1.1",
       "resolved": "https://registry.npmjs.org/remove-trailing-slash/-/remove-trailing-slash-0.1.1.tgz",
       "integrity": "sha512-o4S4Qh6L2jpnCy83ysZDau+VORNvnFw07CKSAymkd6ICNVEPisMyzlc00KlvvicsxKck94SEwhDnMNdICzO+tA=="
     },
-    "node_modules/renderkid": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/renderkid/-/renderkid-3.0.0.tgz",
-      "integrity": "sha512-q/7VIQA8lmM1hF+jn+sFSPWGlMkSAeNYcPLmDQx2zzuiDfaLrOmumR8iaUKlenFgh0XRPIUeSPlH3A+AW3Z5pg==",
-      "dependencies": {
-        "css-select": "^4.1.3",
-        "dom-converter": "^0.2.0",
-        "htmlparser2": "^6.1.0",
-        "lodash": "^4.17.21",
-        "strip-ansi": "^6.0.1"
-      }
-    },
-    "node_modules/renderkid/node_modules/css-select": {
-      "version": "4.3.0",
-      "resolved": "https://registry.npmjs.org/css-select/-/css-select-4.3.0.tgz",
-      "integrity": "sha512-wPpOYtnsVontu2mODhA19JrqWxNsfdatRKd64kmpRbQgh1KtItko5sTnEpPdpSaJszTOhEMlF/RPz28qj4HqhQ==",
-      "dependencies": {
-        "boolbase": "^1.0.0",
-        "css-what": "^6.0.1",
-        "domhandler": "^4.3.1",
-        "domutils": "^2.8.0",
-        "nth-check": "^2.0.1"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/fb55"
-      }
-    },
-    "node_modules/renderkid/node_modules/dom-serializer": {
-      "version": "1.4.1",
-      "resolved": "https://registry.npmjs.org/dom-serializer/-/dom-serializer-1.4.1.tgz",
-      "integrity": "sha512-VHwB3KfrcOOkelEG2ZOfxqLZdfkil8PtJi4P8N2MMXucZq2yLp75ClViUlOVwyoHEDjYU433Aq+5zWP61+RGag==",
-      "dependencies": {
-        "domelementtype": "^2.0.1",
-        "domhandler": "^4.2.0",
-        "entities": "^2.0.0"
-      },
-      "funding": {
-        "url": "https://github.com/cheeriojs/dom-serializer?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/domhandler": {
-      "version": "4.3.1",
-      "resolved": "https://registry.npmjs.org/domhandler/-/domhandler-4.3.1.tgz",
-      "integrity": "sha512-GrwoxYN+uWlzO8uhUXRl0P+kHE4GtVPfYzVLcUxPL7KNdHKj66vvlhiweIHqYYXWlw+T8iLMp42Lm67ghw4WMQ==",
-      "dependencies": {
-        "domelementtype": "^2.2.0"
-      },
-      "engines": {
-        "node": ">= 4"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domhandler?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/domutils": {
-      "version": "2.8.0",
-      "resolved": "https://registry.npmjs.org/domutils/-/domutils-2.8.0.tgz",
-      "integrity": "sha512-w96Cjofp72M5IIhpjgobBimYEfoPjx1Vx0BSX9P30WBdZW2WIKU0T1Bd0kz2eNZ9ikjKgHbEyKx8BB6H1L3h3A==",
-      "dependencies": {
-        "dom-serializer": "^1.0.1",
-        "domelementtype": "^2.2.0",
-        "domhandler": "^4.2.0"
-      },
-      "funding": {
-        "url": "https://github.com/fb55/domutils?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/entities": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/entities/-/entities-2.2.0.tgz",
-      "integrity": "sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==",
-      "funding": {
-        "url": "https://github.com/fb55/entities?sponsor=1"
-      }
-    },
-    "node_modules/renderkid/node_modules/strip-ansi": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/strip-ansi/-/strip-ansi-6.0.1.tgz",
-      "integrity": "sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==",
-      "dependencies": {
-        "ansi-regex": "^5.0.1"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
     "node_modules/require-directory": {
       "version": "2.1.1",
       "resolved": "https://registry.npmjs.org/require-directory/-/require-directory-2.1.1.tgz",
@@ -20212,6 +15026,7 @@
       "version": "4.1.8",
       "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz",
       "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==",
+      "dev": true,
       "license": "MIT"
     },
     "node_modules/resolve": {
@@ -20291,14 +15106,6 @@
       "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
       "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
     },
-    "node_modules/retry": {
-      "version": "0.13.1",
-      "resolved": "https://registry.npmjs.org/retry/-/retry-0.13.1.tgz",
-      "integrity": "sha512-XQBQ3I8W1Cge0Seh+6gjj03LbmRFWuoszgK9ooCpwYIrhhoO80pfq4cUkU5DkknwfOfFteRwlZ56PYOGYyFWdg==",
-      "engines": {
-        "node": ">= 4"
-      }
-    },
     "node_modules/reusify": {
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/reusify/-/reusify-1.0.4.tgz",
@@ -20369,6 +15176,7 @@
       "version": "1.1.3",
       "resolved": "https://registry.npmjs.org/safe-array-concat/-/safe-array-concat-1.1.3.tgz",
       "integrity": "sha512-AURm5f0jYEOydBj7VQlVvDrjeFgthDdEF5H1dP+6mNpoXOMo1quQqJ4wvJDyRZ9+pO3kGWoOdmV08cSv2aJV6Q==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -20402,17 +15210,11 @@
         }
       ]
     },
-    "node_modules/safe-json-stringify": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/safe-json-stringify/-/safe-json-stringify-1.2.0.tgz",
-      "integrity": "sha512-gH8eh2nZudPQO6TytOvbxnuhYBOvDBBLW52tz5q6X58lJcd/tkmqFR+5Z9adS8aJtURSXWThWy/xJtJwixErvg==",
-      "optional": true,
-      "peer": true
-    },
     "node_modules/safe-push-apply": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/safe-push-apply/-/safe-push-apply-1.0.0.tgz",
       "integrity": "sha512-iKE9w/Z7xCzUMIZqdBsp6pEQvwuEebH4vdpjcDWnyzaI6yl6O9FHvVpmGelvEHNsoY6wGblkxR6Zty/h00WiSA==",
+      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "isarray": "^2.0.5"
@@ -20428,6 +15230,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/safe-regex-test/-/safe-regex-test-1.1.0.tgz",
       "integrity": "sha512-x/+Cz4YrimQxQccJf5mKEbIa1NzeCRNI5Ecl/ekmlYaampdNLPalVyIcCZNNH3MvmqBugV5TMYZXv0ljslUlaw==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -20518,11 +15321,6 @@
       "resolved": "https://registry.npmjs.org/json-schema-traverse/-/json-schema-traverse-1.0.0.tgz",
       "integrity": "sha512-NM8/P9n3XjXhIZn1lLhkFaACTOURQXjWhV4BA/RnOv8xvgqtqpAX9IO4mRQxSx1Rlo4tqzeqb0sOlruaOy3dug=="
     },
-    "node_modules/select-hose": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/select-hose/-/select-hose-2.0.0.tgz",
-      "integrity": "sha512-mEugaLK+YfkijB4fx0e6kImuJdCIt2LxCRcbEYPqRGCs4F2ogyfZU5IAZRdjCP8JPq2AtdNoC/Dux63d9Kiryg=="
-    },
     "node_modules/selfsigned": {
       "version": "2.4.1",
       "resolved": "https://registry.npmjs.org/selfsigned/-/selfsigned-2.4.1.tgz",
@@ -20618,72 +15416,11 @@
       "version": "6.0.2",
       "resolved": "https://registry.npmjs.org/serialize-javascript/-/serialize-javascript-6.0.2.tgz",
       "integrity": "sha512-Saa1xPByTTq2gdeFZYLLo+RFE35NHZkAbqZeWNd3BpzppeVisAqpDjcp8dyf6uIvEqJRd46jemmyA4iFIeVk8g==",
+      "peer": true,
       "dependencies": {
         "randombytes": "^2.1.0"
       }
     },
-    "node_modules/serve-index": {
-      "version": "1.9.1",
-      "resolved": "https://registry.npmjs.org/serve-index/-/serve-index-1.9.1.tgz",
-      "integrity": "sha512-pXHfKNP4qujrtteMrSBb0rc8HJ9Ms/GrXwcUtUtD5s4ewDJI8bT3Cz2zTVRMKtri49pLx2e0Ya8ziP5Ya2pZZw==",
-      "dependencies": {
-        "accepts": "~1.3.4",
-        "batch": "0.6.1",
-        "debug": "2.6.9",
-        "escape-html": "~1.0.3",
-        "http-errors": "~1.6.2",
-        "mime-types": "~2.1.17",
-        "parseurl": "~1.3.2"
-      },
-      "engines": {
-        "node": ">= 0.8.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/debug": {
-      "version": "2.6.9",
-      "resolved": "https://registry.npmjs.org/debug/-/debug-2.6.9.tgz",
-      "integrity": "sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==",
-      "dependencies": {
-        "ms": "2.0.0"
-      }
-    },
-    "node_modules/serve-index/node_modules/depd": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/depd/-/depd-1.1.2.tgz",
-      "integrity": "sha512-7emPTl6Dpo6JRXOXjLRxck+FlLRX5847cLKEn00PLAgc3g2hTZZgr+e4c2v6QpSmLeFP3n5yUo7ft6avBK/5jQ==",
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/http-errors": {
-      "version": "1.6.3",
-      "resolved": "https://registry.npmjs.org/http-errors/-/http-errors-1.6.3.tgz",
-      "integrity": "sha512-lks+lVC8dgGyh97jxvxeYTWQFvh4uw4yC12gVl63Cg30sjPX4wuGcdkICVXDAESr6OJGjqGA8Iz5mkeN6zlD7A==",
-      "dependencies": {
-        "depd": "~1.1.2",
-        "inherits": "2.0.3",
-        "setprototypeof": "1.1.0",
-        "statuses": ">= 1.4.0 < 2"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
-    "node_modules/serve-index/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "node_modules/serve-index/node_modules/ms": {
-      "version": "2.0.0",
-      "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
-      "integrity": "sha512-Tpp60P6IUJDTuOq/5Z8cdskzJujfwqfOTkrwIwj7IRISpnkJnT6SyJ4PCPnGMoFjC9ddhal5KVIYtAt97ix05A=="
-    },
-    "node_modules/serve-index/node_modules/setprototypeof": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/setprototypeof/-/setprototypeof-1.1.0.tgz",
-      "integrity": "sha512-BvE/TwpZX4FXExxOxZyRGQQv651MSwmWKZGqvmPcRIjDqWub67kTKuIMx43cZZrS/cBBzwBcNDWoFxt2XEFIpQ=="
-    },
     "node_modules/serve-static": {
       "version": "1.16.2",
       "resolved": "https://registry.npmjs.org/serve-static/-/serve-static-1.16.2.tgz",
@@ -20778,6 +15515,7 @@
       "version": "1.2.2",
       "resolved": "https://registry.npmjs.org/set-function-length/-/set-function-length-1.2.2.tgz",
       "integrity": "sha512-pgRc4hJ4/sNjWCSS9AmnS40x3bNMDTknHgL5UaMBTMyJnU90EgWh1Rz+MC9eFu4BuN/UwZjKQuY/1v3rM7HMfg==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -20794,6 +15532,7 @@
       "version": "2.0.2",
       "resolved": "https://registry.npmjs.org/set-function-name/-/set-function-name-2.0.2.tgz",
       "integrity": "sha512-7PGFlmtwsEADb0WYyvCMa1t+yke6daIG4Wirafur5kcf+MhUnPms1UeR0CKQdTZD81yESwMHbtn+TR+dMviakQ==",
+      "dev": true,
       "dependencies": {
         "define-data-property": "^1.1.4",
         "es-errors": "^1.3.0",
@@ -20808,6 +15547,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/set-proto/-/set-proto-1.0.0.tgz",
       "integrity": "sha512-RJRdvCo6IAnPdsvP/7m6bsQqNnn1FCBX5ZNtFL98MmFF/4xAIJTIg1YbHW5DC2W5SKZanrC6i4HsJqlajw/dZw==",
+      "dev": true,
       "dependencies": {
         "dunder-proto": "^1.0.1",
         "es-errors": "^1.3.0",
@@ -20878,6 +15618,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/side-channel/-/side-channel-1.1.0.tgz",
       "integrity": "sha512-ZX99e6tRweoUXqR+VBrslhda51Nh5MTQwou5tnUDgbtyM0dBgmhEDtWGP/xbKn6hqfPRHujUNwz5fy/wbbhnpw==",
+      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3",
@@ -20896,6 +15637,7 @@
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/side-channel-list/-/side-channel-list-1.0.0.tgz",
       "integrity": "sha512-FCLHtRD/gnpCiCHEiJLOwdmFP+wzCmDEkc9y7NsYxeF4u7Btsn1ZuwgwJGxImImHicJArLP4R0yX4c2KCrMrTA==",
+      "dev": true,
       "dependencies": {
         "es-errors": "^1.3.0",
         "object-inspect": "^1.13.3"
@@ -20911,6 +15653,7 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/side-channel-map/-/side-channel-map-1.0.1.tgz",
       "integrity": "sha512-VCjCNfgMsby3tTdo02nbjtM/ewra6jPHmpThenkTYh8pG9ucZ/1P8So4u4FGBek/BjpOVsDCMoLA/iuBKIFXRA==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -20928,6 +15671,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/side-channel-weakmap/-/side-channel-weakmap-1.0.2.tgz",
       "integrity": "sha512-WPS/HvHQTYnHisLo9McqBHOJk2FkHO/tlpvldyrnem4aeQp4hai3gythswg6p01oSoTl58rcpiFAjF2br2Ak2A==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "es-errors": "^1.3.0",
@@ -21087,21 +15831,6 @@
         }
       }
     },
-    "node_modules/sockjs": {
-      "version": "0.3.24",
-      "resolved": "https://registry.npmjs.org/sockjs/-/sockjs-0.3.24.tgz",
-      "integrity": "sha512-GJgLTZ7vYb/JtPSSZ10hsOYIvEYsjbNU+zPdIHcUaWVNUEPivzxku31865sSSud0Da0W4lEeOPlmw93zLQchuQ==",
-      "dependencies": {
-        "faye-websocket": "^0.11.3",
-        "uuid": "^8.3.2",
-        "websocket-driver": "^0.7.4"
-      }
-    },
-    "node_modules/source-list-map": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/source-list-map/-/source-list-map-2.0.1.tgz",
-      "integrity": "sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw=="
-    },
     "node_modules/source-map": {
       "version": "0.5.7",
       "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.5.7.tgz",
@@ -21118,26 +15847,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/source-map-loader": {
-      "version": "3.0.2",
-      "resolved": "https://registry.npmjs.org/source-map-loader/-/source-map-loader-3.0.2.tgz",
-      "integrity": "sha512-BokxPoLjyl3iOrgkWaakaxqnelAJSS+0V+De0kKIq6lyWrXuiPgYTGp6z3iHmqljKAaLXwZa+ctD8GccRJeVvg==",
-      "dependencies": {
-        "abab": "^2.0.5",
-        "iconv-lite": "^0.6.3",
-        "source-map-js": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
     "node_modules/source-map-support": {
       "version": "0.5.21",
       "resolved": "https://registry.npmjs.org/source-map-support/-/source-map-support-0.5.21.tgz",
@@ -21155,55 +15864,6 @@
         "node": ">=0.10.0"
       }
     },
-    "node_modules/spdy": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/spdy/-/spdy-4.0.2.tgz",
-      "integrity": "sha512-r46gZQZQV+Kl9oItvl1JZZqJKGr+oEkB08A6BzkiR7593/7IbtuncXHd2YoYeTsG4157ZssMu9KYvUHLcjcDoA==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "handle-thing": "^2.0.0",
-        "http-deceiver": "^1.2.7",
-        "select-hose": "^2.0.0",
-        "spdy-transport": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=6.0.0"
-      }
-    },
-    "node_modules/spdy-transport": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/spdy-transport/-/spdy-transport-3.0.0.tgz",
-      "integrity": "sha512-hsLVFE5SjA6TCisWeJXFKniGGOpBgMLmerfO2aCyCU5s7nJ/rpAepqmFifv/GCbSbueEeAJJnmSQ2rKC/g8Fcw==",
-      "dependencies": {
-        "debug": "^4.1.0",
-        "detect-node": "^2.0.4",
-        "hpack.js": "^2.1.6",
-        "obuf": "^1.1.2",
-        "readable-stream": "^3.0.6",
-        "wbuf": "^1.7.3"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/readable-stream": {
-      "version": "3.6.2",
-      "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-3.6.2.tgz",
-      "integrity": "sha512-9u/sniCrY3D5WdsERHzHE4G2YCXqoG5FTHUiCC4SIbr6XcLZBY05ya9EKjYek9O5xOAwjGq+1JdGBAS7Q9ScoA==",
-      "dependencies": {
-        "inherits": "^2.0.3",
-        "string_decoder": "^1.1.1",
-        "util-deprecate": "^1.0.1"
-      },
-      "engines": {
-        "node": ">= 6"
-      }
-    },
-    "node_modules/spdy-transport/node_modules/string_decoder": {
-      "version": "1.3.0",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.3.0.tgz",
-      "integrity": "sha512-hkRX8U1WjJFd8LsDJ2yQ/wWWxaopEsABU1XfkM8A+j0+85JAGppt16cr1Whg6KIbb4okU6Mql6BOj+uup/wKeA==",
-      "dependencies": {
-        "safe-buffer": "~5.2.0"
-      }
-    },
     "node_modules/split": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/split/-/split-1.0.1.tgz",
@@ -21240,12 +15900,6 @@
         "node": "^14.17.0 || ^16.13.0 || >=18.0.0"
       }
     },
-    "node_modules/stable": {
-      "version": "0.1.8",
-      "resolved": "https://registry.npmjs.org/stable/-/stable-0.1.8.tgz",
-      "integrity": "sha512-ji9qxRnOVfcuLDySj9qzhGSEFVobyt1kIOSkj1qZzYLzq7Tos/oUUWvotUPQLlrsidqsK6tBH89Bc9kL5zHA6w==",
-      "deprecated": "Modern JS already guarantees Array#sort() is a stable sort, so this library is deprecated. See the compatibility table on MDN: https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/sort#browser_compatibility"
-    },
     "node_modules/stable-hash": {
       "version": "0.0.4",
       "resolved": "https://registry.npmjs.org/stable-hash/-/stable-hash-0.0.4.tgz",
@@ -21338,15 +15992,6 @@
         "node": ">= 0.6"
       }
     },
-    "node_modules/stream-browserify": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/stream-browserify/-/stream-browserify-1.0.0.tgz",
-      "integrity": "sha512-e+V5xc4LlkOiRr64kZTUdb11exsbpSnwb9uwmXaHeDXCpfHg7vaefMJOxi21Pe74ZOqjZ87blBcqqpNAM4Ku0g==",
-      "dependencies": {
-        "inherits": "~2.0.1",
-        "readable-stream": "^1.0.27-1"
-      }
-    },
     "node_modules/stream-buffers": {
       "version": "2.2.0",
       "resolved": "https://registry.npmjs.org/stream-buffers/-/stream-buffers-2.2.0.tgz",
@@ -21364,11 +16009,6 @@
         "node": ">=4"
       }
     },
-    "node_modules/string_decoder": {
-      "version": "0.10.31",
-      "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-0.10.31.tgz",
-      "integrity": "sha512-ev2QzSzWPYmy9GuqfIVildA4OdcGLeFZQrq5ys6RtiuF+RQQiZWr8TZNyAcuVXyQRYfEO+MsoB/1BuQVhOJuoQ=="
-    },
     "node_modules/string-length": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/string-length/-/string-length-4.0.2.tgz",
@@ -21392,11 +16032,6 @@
         "node": ">=8"
       }
     },
-    "node_modules/string-range": {
-      "version": "1.2.2",
-      "resolved": "https://registry.npmjs.org/string-range/-/string-range-1.2.2.tgz",
-      "integrity": "sha512-tYft6IFi8SjplJpxCUxyqisD3b+R2CSkomrtJYCkvuf1KuCAWgz7YXt4O0jip7efpfCemwHEzTEAO8EuOYgh3w=="
-    },
     "node_modules/string-width": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/string-width/-/string-width-5.1.2.tgz",
@@ -21484,6 +16119,7 @@
       "version": "1.2.10",
       "resolved": "https://registry.npmjs.org/string.prototype.trim/-/string.prototype.trim-1.2.10.tgz",
       "integrity": "sha512-Rs66F0P/1kedk5lyYyH9uBzuiI/kNRmwJAR9quK6VOtIpZ2G+hMZd+HQbbv25MgCA6gEffoMZYxlTod4WcdrKA==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -21504,6 +16140,7 @@
       "version": "1.0.9",
       "resolved": "https://registry.npmjs.org/string.prototype.trimend/-/string.prototype.trimend-1.0.9.tgz",
       "integrity": "sha512-G7Ok5C6E/j4SGfyLCloXTrngQIQU3PWtXGst3yM7Bea9FRURf1S42ZHlZZtsNque2FN2PoUhfZXYLNWwEr4dLQ==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "call-bound": "^1.0.2",
@@ -21521,6 +16158,7 @@
       "version": "1.0.8",
       "resolved": "https://registry.npmjs.org/string.prototype.trimstart/-/string.prototype.trimstart-1.0.8.tgz",
       "integrity": "sha512-UXSH262CSZY1tfu3G3Secr6uGLCFVPMhIqHjlgCUtCCcgihYc/xKs9djMTMUOb2j1mVSeU8EU6NWc/iQKU6Gfg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "define-properties": "^1.2.1",
@@ -21618,40 +16256,12 @@
       "resolved": "https://registry.npmjs.org/structured-headers/-/structured-headers-0.4.1.tgz",
       "integrity": "sha512-0MP/Cxx5SzeeZ10p/bZI0S6MpgD+yxAhi1BOQ34jgnMXsCq3j1t6tQnZu+KdlL7dvJTLT3g9xN8tl10TqgFMcg=="
     },
-    "node_modules/style-loader": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/style-loader/-/style-loader-3.3.4.tgz",
-      "integrity": "sha512-0WqXzrsMTyb8yjZJHDqwmnwRJvhALK9LfRtRc6B4UTWe8AijYLZYZ9thuJTZc2VfQWINADW/j+LiJnfy2RoC1w==",
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^5.0.0"
-      }
-    },
-    "node_modules/stylehacks": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/stylehacks/-/stylehacks-5.1.1.tgz",
-      "integrity": "sha512-sBpcd5Hx7G6seo7b1LkpttvTz7ikD0LlH5RmdcBNb6fFR0Fl7LQwHDFr300q4cwUqi+IYrFGmsIHieMBfnN/Bw==",
-      "dependencies": {
-        "browserslist": "^4.21.4",
-        "postcss-selector-parser": "^6.0.4"
-      },
-      "engines": {
-        "node": "^10 || ^12 || >=14.0"
-      },
-      "peerDependencies": {
-        "postcss": "^8.2.15"
-      }
-    },
     "node_modules/styleq": {
       "version": "0.1.3",
       "resolved": "https://registry.npmjs.org/styleq/-/styleq-0.1.3.tgz",
-      "integrity": "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA=="
+      "integrity": "sha512-3ZUifmCDCQanjeej1f6kyl/BeP/Vae5EYkQ9iJfUm/QwZvlgnZzyflqAsAWYURdtea8Vkvswu2GrC57h3qffcA==",
+      "optional": true,
+      "peer": true
     },
     "node_modules/sucrase": {
       "version": "3.35.0",
@@ -22025,6 +16635,7 @@
       "version": "5.3.11",
       "resolved": "https://registry.npmjs.org/terser-webpack-plugin/-/terser-webpack-plugin-5.3.11.tgz",
       "integrity": "sha512-RVCsMfuD0+cTt3EwX8hSl2Ks56EbFHWmhluwcqoPKtBnfjiT6olaq7PRIRfhyU8nnC2MrnDrBLfrD/RGE+cVXQ==",
+      "peer": true,
       "dependencies": {
         "@jridgewell/trace-mapping": "^0.3.25",
         "jest-worker": "^27.4.5",
@@ -22058,6 +16669,7 @@
       "version": "27.5.1",
       "resolved": "https://registry.npmjs.org/jest-worker/-/jest-worker-27.5.1.tgz",
       "integrity": "sha512-7vuh85V5cdDofPyxn58nrPjBktZo0u9x1g8WtjQol+jZDaE+fhN+cIvTj11GndBnMnyfrUOG1sZQxCdjKh+DKg==",
+      "peer": true,
       "dependencies": {
         "@types/node": "*",
         "merge-stream": "^2.0.0",
@@ -22071,6 +16683,7 @@
       "version": "8.1.1",
       "resolved": "https://registry.npmjs.org/supports-color/-/supports-color-8.1.1.tgz",
       "integrity": "sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==",
+      "peer": true,
       "dependencies": {
         "has-flag": "^4.0.0"
       },
@@ -22119,12 +16732,6 @@
         "url": "https://github.com/sponsors/isaacs"
       }
     },
-    "node_modules/text-table": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
-      "integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
-      "peer": true
-    },
     "node_modules/thenify": {
       "version": "3.3.1",
       "resolved": "https://registry.npmjs.org/thenify/-/thenify-3.3.1.tgz",
@@ -22154,28 +16761,6 @@
       "resolved": "https://registry.npmjs.org/through/-/through-2.3.8.tgz",
       "integrity": "sha512-w89qg7PI8wAdvX60bMDP+bFoD5Dvhm9oLheFp5O4a2QF0cSBGsBX4qZmadPMvVqlLJBBci+WqGGOAPvcDeNSVg=="
     },
-    "node_modules/thunky": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/thunky/-/thunky-1.1.0.tgz",
-      "integrity": "sha512-eHY7nBftgThBqOyHGVN+l8gF0BucP09fMo0oO/Lb0w1OF80dJv+lDVpXG60WMQvkcxAkNybKsrEIE3ZtKGmPrA=="
-    },
-    "node_modules/timers-browserify": {
-      "version": "1.4.2",
-      "resolved": "https://registry.npmjs.org/timers-browserify/-/timers-browserify-1.4.2.tgz",
-      "integrity": "sha512-PIxwAupJZiYU4JmVZYwXp9FKsHMXb5h0ZEFyuXTAn8WLHOlcij+FEcbrvDsom1o5dr1YggEtFbECvGCW2sT53Q==",
-      "dependencies": {
-        "process": "~0.11.0"
-      },
-      "engines": {
-        "node": ">=0.6.0"
-      }
-    },
-    "node_modules/tiny-queue": {
-      "version": "0.2.0",
-      "resolved": "https://registry.npmjs.org/tiny-queue/-/tiny-queue-0.2.0.tgz",
-      "integrity": "sha512-ucfrvjzfbtc+xqmn95DEUtGcDHJHQgZ9IR0mizPOZBkY45reZDCJjafUGVJOGJassjn0MavTyWOCQcG+agpLxw==",
-      "peer": true
-    },
     "node_modules/tinyglobby": {
       "version": "0.2.12",
       "resolved": "https://registry.npmjs.org/tinyglobby/-/tinyglobby-0.2.12.tgz",
@@ -22266,23 +16851,6 @@
       "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz",
       "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw=="
     },
-    "node_modules/traverse": {
-      "version": "0.6.11",
-      "resolved": "https://registry.npmjs.org/traverse/-/traverse-0.6.11.tgz",
-      "integrity": "sha512-vxXDZg8/+p3gblxB6BhhG5yWVn1kGRlaL8O78UDXc3wRnPizB5g83dcvWV1jpDMIPnjZjOFuxlMmE82XJ4407w==",
-      "peer": true,
-      "dependencies": {
-        "gopd": "^1.2.0",
-        "typedarray.prototype.slice": "^1.0.5",
-        "which-typed-array": "^1.1.18"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/ts-api-utils": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/ts-api-utils/-/ts-api-utils-2.0.1.tgz",
@@ -22311,11 +16879,6 @@
       "resolved": "https://registry.npmjs.org/tslib/-/tslib-2.8.1.tgz",
       "integrity": "sha512-oJFu94HQb+KVduSUQL7wnpmqnfmLsOA/nAh6b6EH0wCEoK0/mPeXU6c3wKDV83MkOuHPRHtSXKKU99IBazS/2w=="
     },
-    "node_modules/tty-browserify": {
-      "version": "0.0.0",
-      "resolved": "https://registry.npmjs.org/tty-browserify/-/tty-browserify-0.0.0.tgz",
-      "integrity": "sha512-JVa5ijo+j/sOoHGjw0sxw734b1LhBkQ3bvUGNdxnVXDCX81Yx7TFgnZygxrIIWn23hbfTaMYLwRmAxFyDuFmIw=="
-    },
     "node_modules/type-check": {
       "version": "0.4.0",
       "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.4.0.tgz",
@@ -22347,22 +16910,11 @@
         "url": "https://github.com/sponsors/sindresorhus"
       }
     },
-    "node_modules/type-is": {
-      "version": "1.6.18",
-      "resolved": "https://registry.npmjs.org/type-is/-/type-is-1.6.18.tgz",
-      "integrity": "sha512-TkRKr9sUTxEH8MdfuCSP7VizJyzRNMjj2J2do2Jr3Kym598JVdEksuzPQCnlFPW4ky9Q+iA+ma9BGm06XQBy8g==",
-      "dependencies": {
-        "media-typer": "0.3.0",
-        "mime-types": "~2.1.24"
-      },
-      "engines": {
-        "node": ">= 0.6"
-      }
-    },
     "node_modules/typed-array-buffer": {
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-buffer/-/typed-array-buffer-1.0.3.tgz",
       "integrity": "sha512-nAYYwfY3qnzX30IkA6AQZjVbtK6duGontcQm1WSG1MD94YLqK0515GNApXkoxKOWMusVssAHWLh9SeaoefYFGw==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "es-errors": "^1.3.0",
@@ -22376,6 +16928,7 @@
       "version": "1.0.3",
       "resolved": "https://registry.npmjs.org/typed-array-byte-length/-/typed-array-byte-length-1.0.3.tgz",
       "integrity": "sha512-BaXgOuIxz8n8pIq3e7Atg/7s+DpiYrxn4vdot3w9KbnBhcRQq6o3xemQdIfynqSeXeDrF32x+WvfzmOjPiY9lg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.8",
         "for-each": "^0.3.3",
@@ -22394,6 +16947,7 @@
       "version": "1.0.4",
       "resolved": "https://registry.npmjs.org/typed-array-byte-offset/-/typed-array-byte-offset-1.0.4.tgz",
       "integrity": "sha512-bTlAFB/FBYMcuX81gbL4OcpH5PmlFHqlCCpAl8AlEzMz5k53oNDvN8p1PNOWLEmI2x4orp3raOFB51tv9X+MFQ==",
+      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -22414,6 +16968,7 @@
       "version": "1.0.7",
       "resolved": "https://registry.npmjs.org/typed-array-length/-/typed-array-length-1.0.7.tgz",
       "integrity": "sha512-3KS2b+kL7fsuk/eJZ7EQdnEmQoaho/r6KUef7hxvltNA5DR8NAUM+8wJMbJyZ4G9/7i3v5zPBIMN5aybAh2/Jg==",
+      "dev": true,
       "dependencies": {
         "call-bind": "^1.0.7",
         "for-each": "^0.3.3",
@@ -22429,33 +16984,6 @@
         "url": "https://github.com/sponsors/ljharb"
       }
     },
-    "node_modules/typedarray": {
-      "version": "0.0.6",
-      "resolved": "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz",
-      "integrity": "sha512-/aCDEGatGvZ2BIk+HmLf4ifCJFwvKFNb9/JeZPMulfgFracn9QFcAf5GO8B/mweUjSoblS5In0cWhqpfs/5PQA=="
-    },
-    "node_modules/typedarray.prototype.slice": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/typedarray.prototype.slice/-/typedarray.prototype.slice-1.0.5.tgz",
-      "integrity": "sha512-q7QNVDGTdl702bVFiI5eY4l/HkgCM6at9KhcFbgUAzezHFbOVy4+0O/lCjsABEQwbZPravVfBIiBVGo89yzHFg==",
-      "peer": true,
-      "dependencies": {
-        "call-bind": "^1.0.8",
-        "define-properties": "^1.2.1",
-        "es-abstract": "^1.23.9",
-        "es-errors": "^1.3.0",
-        "get-proto": "^1.0.1",
-        "math-intrinsics": "^1.1.0",
-        "typed-array-buffer": "^1.0.3",
-        "typed-array-byte-offset": "^1.0.4"
-      },
-      "engines": {
-        "node": ">= 0.4"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/ljharb"
-      }
-    },
     "node_modules/typescript": {
       "version": "5.7.3",
       "resolved": "https://registry.npmjs.org/typescript/-/typescript-5.7.3.tgz",
@@ -22520,6 +17048,7 @@
       "version": "1.1.0",
       "resolved": "https://registry.npmjs.org/unbox-primitive/-/unbox-primitive-1.1.0.tgz",
       "integrity": "sha512-nWJ91DjeOkej/TA8pXQ3myruKpKEYgqvpw9lz4OPHj/NWFNluYrjbz9j01CJ8yKQd2g4jFoOkINCTW2I5LEEyw==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.3",
         "has-bigints": "^1.0.2",
@@ -22660,15 +17189,6 @@
         "browserslist": ">= 4.21.0"
       }
     },
-    "node_modules/update-check": {
-      "version": "1.5.3",
-      "resolved": "https://registry.npmjs.org/update-check/-/update-check-1.5.3.tgz",
-      "integrity": "sha512-6KLU4/dd0Tg/l0xwL+f9V7kEIPSL1vOIbnNnhSLiRDlj4AVG6Ks9Zoc9Jgt9kIgWFPZ/wp2AHgmG7xNf15TJOA==",
-      "dependencies": {
-        "registry-auth-token": "3.3.2",
-        "registry-url": "3.1.0"
-      }
-    },
     "node_modules/uri-js": {
       "version": "4.4.1",
       "resolved": "https://registry.npmjs.org/uri-js/-/uri-js-4.4.1.tgz",
@@ -22677,21 +17197,6 @@
         "punycode": "^2.1.0"
       }
     },
-    "node_modules/url": {
-      "version": "0.10.3",
-      "resolved": "https://registry.npmjs.org/url/-/url-0.10.3.tgz",
-      "integrity": "sha512-hzSUW2q06EqL1gKM/a+obYHLIO6ct2hwPuviqTTOcfFVc61UbfJ2Q32+uGL/HCPxKqrdGB5QUwIe7UqlDgwsOQ==",
-      "dependencies": {
-        "punycode": "1.3.2",
-        "querystring": "0.2.0"
-      }
-    },
-    "node_modules/url-join": {
-      "version": "4.0.0",
-      "resolved": "https://registry.npmjs.org/url-join/-/url-join-4.0.0.tgz",
-      "integrity": "sha512-EGXjXJZhIHiQMK2pQukuFcL303nskqIRzWvPvV5O8miOfwoUb9G+a/Cld60kUyeaybEI94wvVClT10DtfeAExA==",
-      "peer": true
-    },
     "node_modules/url-parse": {
       "version": "1.5.10",
       "resolved": "https://registry.npmjs.org/url-parse/-/url-parse-1.5.10.tgz",
@@ -22701,11 +17206,6 @@
         "requires-port": "^1.0.0"
       }
     },
-    "node_modules/url/node_modules/punycode": {
-      "version": "1.3.2",
-      "resolved": "https://registry.npmjs.org/punycode/-/punycode-1.3.2.tgz",
-      "integrity": "sha512-RofWgt/7fL5wP1Y7fxE7/EmTLzQVnB0ycyibJ0OOHIlJqTNzglYFxVwETOcIoJqJmpDXJ9xImDv+Fq34F/d4Dw=="
-    },
     "node_modules/use-latest-callback": {
       "version": "0.2.3",
       "resolved": "https://registry.npmjs.org/use-latest-callback/-/use-latest-callback-0.2.3.tgz",
@@ -22724,34 +17224,11 @@
         "react": "^16.8.0 || ^17.0.0 || ^18.0.0 || ^19.0.0"
       }
     },
-    "node_modules/utf8": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/utf8/-/utf8-3.0.0.tgz",
-      "integrity": "sha512-E8VjFIQ/TyQgp+TZfS6l8yp/xWppSAHzidGiRrqe4bK4XP9pTRyKFgGJpO3SN7zdX4DeomTrwaseCHovfpFcqQ=="
-    },
-    "node_modules/util": {
-      "version": "0.10.4",
-      "resolved": "https://registry.npmjs.org/util/-/util-0.10.4.tgz",
-      "integrity": "sha512-0Pm9hTQ3se5ll1XihRic3FDIku70C+iHUdT/W926rSgHV5QgXsYbKZN8MSC3tJtSkhuROzvsQjAaFENRXr+19A==",
-      "dependencies": {
-        "inherits": "2.0.3"
-      }
-    },
     "node_modules/util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
       "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
     },
-    "node_modules/util/node_modules/inherits": {
-      "version": "2.0.3",
-      "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.3.tgz",
-      "integrity": "sha512-x00IRNXNy63jwGkJmzPigoySHbaqpNuzKbBOmzK+g2OdZpQ9w+sxCN+VSB3ja7IAge2OP2qpfxTjeNcyjmW1uw=="
-    },
-    "node_modules/utila": {
-      "version": "0.4.0",
-      "resolved": "https://registry.npmjs.org/utila/-/utila-0.4.0.tgz",
-      "integrity": "sha512-Z0DbgELS9/L/75wZbro8xAnT50pBVFQZ+hUEueGDU5FN51YSCYM+jdxsfCiHjwNP/4LCDD0i/graKpeBnOXKRA=="
-    },
     "node_modules/utils-merge": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/utils-merge/-/utils-merge-1.0.1.tgz",
@@ -22781,12 +17258,6 @@
         "node": ">=10.12.0"
       }
     },
-    "node_modules/valid-url": {
-      "version": "1.0.9",
-      "resolved": "https://registry.npmjs.org/valid-url/-/valid-url-1.0.9.tgz",
-      "integrity": "sha512-QQDsV8OnSf5Uc30CKSwG9lnhMPe6exHtTXLRYX8uMwKENy640pU+2BgBL0LRbDh/eYRahNCS7aewCx0wf3NYVA==",
-      "peer": true
-    },
     "node_modules/validate-npm-package-name": {
       "version": "5.0.1",
       "resolved": "https://registry.npmjs.org/validate-npm-package-name/-/validate-npm-package-name-5.0.1.tgz",
@@ -22808,14 +17279,6 @@
       "resolved": "https://registry.npmjs.org/vlq/-/vlq-1.0.1.tgz",
       "integrity": "sha512-gQpnTgkubC6hQgdIcRdYGDSDc+SaujOdyesZQMv6JlfQee/9Mp0Qhnys6WxDWvQnL5WZdT7o2Ul187aSt0Rq+w=="
     },
-    "node_modules/vm-browserify": {
-      "version": "0.0.4",
-      "resolved": "https://registry.npmjs.org/vm-browserify/-/vm-browserify-0.0.4.tgz",
-      "integrity": "sha512-NyZNR3WDah+NPkjh/YmhuWSsT4a0mF0BJYgUmvrJ70zxjTXh5Y2Asobxlh0Nfs0PCFB5FVpRJft7NozAWFMwLQ==",
-      "dependencies": {
-        "indexof": "0.0.1"
-      }
-    },
     "node_modules/w3c-xmlserializer": {
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/w3c-xmlserializer/-/w3c-xmlserializer-4.0.0.tgz",
@@ -22845,6 +17308,7 @@
       "version": "2.4.2",
       "resolved": "https://registry.npmjs.org/watchpack/-/watchpack-2.4.2.tgz",
       "integrity": "sha512-TnbFSbcOCcDgjZ4piURLCbJ3nJhznVh9kw6F6iokjiFPl8ONxe9A6nMDVXDiNbrSfLILs6vB07F7wLBrwPYzJw==",
+      "peer": true,
       "dependencies": {
         "glob-to-regexp": "^0.4.1",
         "graceful-fs": "^4.1.2"
@@ -22853,14 +17317,6 @@
         "node": ">=10.13.0"
       }
     },
-    "node_modules/wbuf": {
-      "version": "1.7.3",
-      "resolved": "https://registry.npmjs.org/wbuf/-/wbuf-1.7.3.tgz",
-      "integrity": "sha512-O84QOnr0icsbFGLS0O3bI5FswxzRr8/gHwWkDlQFskhSPryQXvrTMxjxGP4+iWYoauLoBvfDpkrOauZ+0iZpDA==",
-      "dependencies": {
-        "minimalistic-assert": "^1.0.0"
-      }
-    },
     "node_modules/wcwidth": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/wcwidth/-/wcwidth-1.0.1.tgz",
@@ -22886,6 +17342,7 @@
       "version": "5.98.0",
       "resolved": "https://registry.npmjs.org/webpack/-/webpack-5.98.0.tgz",
       "integrity": "sha512-UFynvx+gM44Gv9qFgj0acCQK2VE1CtdfwFdimkapco3hlPCJ/zeq73n2yVKimVbtm+TnApIugGhLJnkU6gjYXA==",
+      "peer": true,
       "dependencies": {
         "@types/eslint-scope": "^3.7.7",
         "@types/estree": "^1.0.6",
@@ -22927,242 +17384,11 @@
         }
       }
     },
-    "node_modules/webpack-dev-middleware": {
-      "version": "5.3.4",
-      "resolved": "https://registry.npmjs.org/webpack-dev-middleware/-/webpack-dev-middleware-5.3.4.tgz",
-      "integrity": "sha512-BVdTqhhs+0IfoeAf7EoH5WE+exCmqGerHfDM0IL096Px60Tq2Mn9MAbnaGUe6HiMa41KMCYF19gyzZmBcq/o4Q==",
-      "dependencies": {
-        "colorette": "^2.0.10",
-        "memfs": "^3.4.3",
-        "mime-types": "^2.1.31",
-        "range-parser": "^1.2.1",
-        "schema-utils": "^4.0.0"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.0.0 || ^5.0.0"
-      }
-    },
-    "node_modules/webpack-dev-server": {
-      "version": "4.15.2",
-      "resolved": "https://registry.npmjs.org/webpack-dev-server/-/webpack-dev-server-4.15.2.tgz",
-      "integrity": "sha512-0XavAZbNJ5sDrCbkpWL8mia0o5WPOd2YGtxrEiZkBK9FjLppIUK2TgxK6qGD2P3hUXTJNNPVibrerKcx5WkR1g==",
-      "dependencies": {
-        "@types/bonjour": "^3.5.9",
-        "@types/connect-history-api-fallback": "^1.3.5",
-        "@types/express": "^4.17.13",
-        "@types/serve-index": "^1.9.1",
-        "@types/serve-static": "^1.13.10",
-        "@types/sockjs": "^0.3.33",
-        "@types/ws": "^8.5.5",
-        "ansi-html-community": "^0.0.8",
-        "bonjour-service": "^1.0.11",
-        "chokidar": "^3.5.3",
-        "colorette": "^2.0.10",
-        "compression": "^1.7.4",
-        "connect-history-api-fallback": "^2.0.0",
-        "default-gateway": "^6.0.3",
-        "express": "^4.17.3",
-        "graceful-fs": "^4.2.6",
-        "html-entities": "^2.3.2",
-        "http-proxy-middleware": "^2.0.3",
-        "ipaddr.js": "^2.0.1",
-        "launch-editor": "^2.6.0",
-        "open": "^8.0.9",
-        "p-retry": "^4.5.0",
-        "rimraf": "^3.0.2",
-        "schema-utils": "^4.0.0",
-        "selfsigned": "^2.1.1",
-        "serve-index": "^1.9.1",
-        "sockjs": "^0.3.24",
-        "spdy": "^4.0.2",
-        "webpack-dev-middleware": "^5.3.4",
-        "ws": "^8.13.0"
-      },
-      "bin": {
-        "webpack-dev-server": "bin/webpack-dev-server.js"
-      },
-      "engines": {
-        "node": ">= 12.13.0"
-      },
-      "funding": {
-        "type": "opencollective",
-        "url": "https://opencollective.com/webpack"
-      },
-      "peerDependencies": {
-        "webpack": "^4.37.0 || ^5.0.0"
-      },
-      "peerDependenciesMeta": {
-        "webpack": {
-          "optional": true
-        },
-        "webpack-cli": {
-          "optional": true
-        }
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/default-gateway": {
-      "version": "6.0.3",
-      "resolved": "https://registry.npmjs.org/default-gateway/-/default-gateway-6.0.3.tgz",
-      "integrity": "sha512-fwSOJsbbNzZ/CUFpqFBqYfYNLj1NbMPm8MMCIzHjC83iSJRBEGmDUxU+WP661BaBQImeC2yHwXtz+P/O9o+XEg==",
-      "dependencies": {
-        "execa": "^5.0.0"
-      },
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/execa": {
-      "version": "5.1.1",
-      "resolved": "https://registry.npmjs.org/execa/-/execa-5.1.1.tgz",
-      "integrity": "sha512-8uSpZZocAZRBAPIEINJj3Lo9HyGitllczc27Eh5YYojjMFMn8yHMDMaUHE2Jqfq05D/wucwI4JGURyXt1vchyg==",
-      "dependencies": {
-        "cross-spawn": "^7.0.3",
-        "get-stream": "^6.0.0",
-        "human-signals": "^2.1.0",
-        "is-stream": "^2.0.0",
-        "merge-stream": "^2.0.0",
-        "npm-run-path": "^4.0.1",
-        "onetime": "^5.1.2",
-        "signal-exit": "^3.0.3",
-        "strip-final-newline": "^2.0.0"
-      },
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sindresorhus/execa?sponsor=1"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/get-stream": {
-      "version": "6.0.1",
-      "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-6.0.1.tgz",
-      "integrity": "sha512-ts6Wi+2j3jQjqi70w5AlN8DFnkSwC+MqmxEzdEALB2qXZYV3X/b1CTfgPLGJNMeAWxdPfU8FO1ms3NUfaHCPYg==",
-      "engines": {
-        "node": ">=10"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/ipaddr.js": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/ipaddr.js/-/ipaddr.js-2.2.0.tgz",
-      "integrity": "sha512-Ag3wB2o37wslZS19hZqorUnrnzSkpOVy+IiiDEiTqNubEYpYuHWIf6K4psgN2ZWKExS4xhVCrRVfb/wfW8fWJA==",
-      "engines": {
-        "node": ">= 10"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/is-stream": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/is-stream/-/is-stream-2.0.1.tgz",
-      "integrity": "sha512-hFoiJiTl63nn+kstHGBtewWSKnQLpyb155KHheA1l39uvtO9nWIop1p3udqPcUd/xbF1VLMO4n7OI6p7RbngDg==",
-      "engines": {
-        "node": ">=8"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/mimic-fn": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/mimic-fn/-/mimic-fn-2.1.0.tgz",
-      "integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
-      "engines": {
-        "node": ">=6"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/npm-run-path": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/npm-run-path/-/npm-run-path-4.0.1.tgz",
-      "integrity": "sha512-S48WzZW777zhNIrn7gxOlISNAqi9ZC/uQFnRdbeIHhZhCA6UqpkOT8T1G7BvfdgP4Er8gF4sUbaS0i7QvIfCWw==",
-      "dependencies": {
-        "path-key": "^3.0.0"
-      },
-      "engines": {
-        "node": ">=8"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/onetime": {
-      "version": "5.1.2",
-      "resolved": "https://registry.npmjs.org/onetime/-/onetime-5.1.2.tgz",
-      "integrity": "sha512-kbpaSSGJTWdAY5KPVeMOKXSrPtr8C8C7wodJbcsd51jRnmD+GZu8Y0VoU6Dm5Z4vWr0Ig/1NKuWRKf7j5aaYSg==",
-      "dependencies": {
-        "mimic-fn": "^2.1.0"
-      },
-      "engines": {
-        "node": ">=6"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/open": {
-      "version": "8.4.2",
-      "resolved": "https://registry.npmjs.org/open/-/open-8.4.2.tgz",
-      "integrity": "sha512-7x81NCL719oNbsq/3mh+hVrAWmFuEYUqrq/Iw3kUzH8ReypT9QQ0BLoJS7/G9k6N81XjW4qHWtjWwe/9eLy1EQ==",
-      "dependencies": {
-        "define-lazy-prop": "^2.0.0",
-        "is-docker": "^2.1.1",
-        "is-wsl": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12"
-      },
-      "funding": {
-        "url": "https://github.com/sponsors/sindresorhus"
-      }
-    },
-    "node_modules/webpack-dev-server/node_modules/signal-exit": {
-      "version": "3.0.7",
-      "resolved": "https://registry.npmjs.org/signal-exit/-/signal-exit-3.0.7.tgz",
-      "integrity": "sha512-wnD2ZE+l+SPC/uoS0vXeE9L1+0wuaMqKlfz9AMUo38JsyLSBWSFcHR1Rri62LZc12vLr1gb3jl7iwQhgwpAbGQ=="
-    },
-    "node_modules/webpack-manifest-plugin": {
-      "version": "4.1.1",
-      "resolved": "https://registry.npmjs.org/webpack-manifest-plugin/-/webpack-manifest-plugin-4.1.1.tgz",
-      "integrity": "sha512-YXUAwxtfKIJIKkhg03MKuiFAD72PlrqCiwdwO4VEXdRO5V0ORCNwaOwAZawPZalCbmH9kBDmXnNeQOw+BIEiow==",
-      "dependencies": {
-        "tapable": "^2.0.0",
-        "webpack-sources": "^2.2.0"
-      },
-      "engines": {
-        "node": ">=12.22.0"
-      },
-      "peerDependencies": {
-        "webpack": "^4.44.2 || ^5.47.0"
-      }
-    },
-    "node_modules/webpack-manifest-plugin/node_modules/source-map": {
-      "version": "0.6.1",
-      "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
-      "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
-      "engines": {
-        "node": ">=0.10.0"
-      }
-    },
-    "node_modules/webpack-manifest-plugin/node_modules/webpack-sources": {
-      "version": "2.3.1",
-      "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-2.3.1.tgz",
-      "integrity": "sha512-y9EI9AO42JjEcrTJFOYmVywVZdKVUfOvDUPsJea5GIr1JOEGFVqwlY2K098fFoIjOkDzHn2AjRvM8dsBZu+gCA==",
-      "dependencies": {
-        "source-list-map": "^2.0.1",
-        "source-map": "^0.6.1"
-      },
-      "engines": {
-        "node": ">=10.13.0"
-      }
-    },
     "node_modules/webpack-sources": {
       "version": "3.2.3",
       "resolved": "https://registry.npmjs.org/webpack-sources/-/webpack-sources-3.2.3.tgz",
       "integrity": "sha512-/DyMEOrDgLKKIG0fmvtz+4dUX/3Ghozwgm6iPp8KRhvn+eQf9+Q7GWxVNMk3+uCPWfdXYC4ExGBckIXdFEfH1w==",
+      "peer": true,
       "engines": {
         "node": ">=10.13.0"
       }
@@ -23171,6 +17397,7 @@
       "version": "5.1.1",
       "resolved": "https://registry.npmjs.org/eslint-scope/-/eslint-scope-5.1.1.tgz",
       "integrity": "sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==",
+      "peer": true,
       "dependencies": {
         "esrecurse": "^4.3.0",
         "estraverse": "^4.1.1"
@@ -23183,31 +17410,11 @@
       "version": "4.3.0",
       "resolved": "https://registry.npmjs.org/estraverse/-/estraverse-4.3.0.tgz",
       "integrity": "sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==",
+      "peer": true,
       "engines": {
         "node": ">=4.0"
       }
     },
-    "node_modules/websocket-driver": {
-      "version": "0.7.4",
-      "resolved": "https://registry.npmjs.org/websocket-driver/-/websocket-driver-0.7.4.tgz",
-      "integrity": "sha512-b17KeDIQVjvb0ssuSDF2cYXSg2iztliJ4B9WdsuB6J952qCPKmnVq4DyW5motImXHDC1cBT/1UezrJVsKw5zjg==",
-      "dependencies": {
-        "http-parser-js": ">=0.5.1",
-        "safe-buffer": ">=5.1.0",
-        "websocket-extensions": ">=0.1.1"
-      },
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
-    "node_modules/websocket-extensions": {
-      "version": "0.1.4",
-      "resolved": "https://registry.npmjs.org/websocket-extensions/-/websocket-extensions-0.1.4.tgz",
-      "integrity": "sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg==",
-      "engines": {
-        "node": ">=0.8.0"
-      }
-    },
     "node_modules/whatwg-encoding": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/whatwg-encoding/-/whatwg-encoding-2.0.0.tgz",
@@ -23280,6 +17487,7 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/which-boxed-primitive/-/which-boxed-primitive-1.1.1.tgz",
       "integrity": "sha512-TbX3mj8n0odCBFVlY8AxkqcHASw3L60jIuF8jFP78az3C2YhmGvqbHBpAjTRH2/xqYunrJ9g1jSyjCjpoWzIAA==",
+      "dev": true,
       "dependencies": {
         "is-bigint": "^1.1.0",
         "is-boolean-object": "^1.2.1",
@@ -23298,6 +17506,7 @@
       "version": "1.2.1",
       "resolved": "https://registry.npmjs.org/which-builtin-type/-/which-builtin-type-1.2.1.tgz",
       "integrity": "sha512-6iBczoX+kDQ7a3+YJBnh3T+KZRxM/iYNPXicqk66/Qfm1b93iu+yOImkg0zHbj5LNOcNv1TEADiZ0xa34B4q6Q==",
+      "dev": true,
       "dependencies": {
         "call-bound": "^1.0.2",
         "function.prototype.name": "^1.1.6",
@@ -23324,6 +17533,7 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/which-collection/-/which-collection-1.0.2.tgz",
       "integrity": "sha512-K4jVyjnBdgvc86Y6BkaLZEN933SwYOuBFkdmBu9ZfkcAbdVbpITnDmjvZ/aQjRXQrv5EPkTnD1s39GiiqbngCw==",
+      "dev": true,
       "dependencies": {
         "is-map": "^2.0.3",
         "is-set": "^2.0.3",
@@ -23341,6 +17551,7 @@
       "version": "1.1.18",
       "resolved": "https://registry.npmjs.org/which-typed-array/-/which-typed-array-1.1.18.tgz",
       "integrity": "sha512-qEcY+KJYlWyLH9vNbsr6/5j59AXk5ni5aakf8ldzBvGde6Iz4sxZGkJyWSAueTG7QhOvNRYb1lDdFmL5Td0QKA==",
+      "dev": true,
       "dependencies": {
         "available-typed-arrays": "^1.0.7",
         "call-bind": "^1.0.8",
@@ -23576,15 +17787,6 @@
         "node": ">=0.4.0"
       }
     },
-    "node_modules/xtend": {
-      "version": "4.0.2",
-      "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "peer": true,
-      "engines": {
-        "node": ">=0.4"
-      }
-    },
     "node_modules/y18n": {
       "version": "5.0.8",
       "resolved": "https://registry.npmjs.org/y18n/-/y18n-5.0.8.tgz",
diff --git a/package.json b/package.json
index 917b07e..62c765a 100644
--- a/package.json
+++ b/package.json
@@ -23,7 +23,6 @@
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
-    "cloudinary-react-native": "^1.0.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
@@ -52,7 +51,8 @@
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "socket.io-client": "^4.8.1",
-    "tailwindcss": "^3.4.17"
+    "tailwindcss": "^3.4.17",
+    "expo-dev-client": "~5.0.20"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/config.ts b/src/config.ts
index 9e75f04..26c8d4d 100644
--- a/src/config.ts
+++ b/src/config.ts
@@ -1,6 +1,6 @@
-import { PHARMATECH_DEV_MODE, GOOGLE_MAPS_API_KEY } from '@env';
-
 export const Config = {
-  isDevelopment: PHARMATECH_DEV_MODE === 'true',
-  googleMapsApiKey: GOOGLE_MAPS_API_KEY,
+  isDevelopment: process.env.PHARMATECH_DEV_MODE === 'true',
+  googleMapsApiKey: process.env.GOOGLE_MAPS_API_KEY || '',
 };
+
+console.log('Variables de entorno disponibles:', process.env);
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index fed6326..ee10956 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -96,8 +96,9 @@ const ProfileScreen = () => {
 
       if (image !== null) {
         const imageResponse = await ImageService.uploadImage(image);
-        if (imageResponse)
-          updatedProfile.profilePicture = imageResponse.secure_url;
+        if (imageResponse) {
+          updatedProfile.profilePicture = imageResponse.secure_url; // Ahora accede correctamente a secure_url
+        }
       } else {
         updatedProfile.profilePicture = 'https://via.placeholder.com/150';
       }
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index 8cd08ad..a85b204 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -10,6 +10,8 @@ import PoppinsText from '../components/PoppinsText';
 import { Config } from '../config';
 
 const SelectLocationScreen = () => {
+  console.log('Clave de API utilizada:', Config.googleMapsApiKey);
+
   const [selectedLocation, setSelectedLocation] = useState<{
     latitude: number;
     longitude: number;
diff --git a/src/services/images.ts b/src/services/images.ts
index aee06c2..9774ed7 100644
--- a/src/services/images.ts
+++ b/src/services/images.ts
@@ -1,41 +1,62 @@
-import { upload } from 'cloudinary-react-native';
-import { Cloudinary } from '@cloudinary/url-gen';
-import {
-  UploadApiErrorResponse,
-  UploadApiResponse,
-} from 'cloudinary-react-native/lib/typescript/src/api/upload/model/params/upload-params';
+import axios from 'axios';
+
+interface FileData {
+  uri: string;
+  type: string;
+  name: string;
+}
 
 export const ImageService = {
   uploadImage: async (
-    image: string,
-  ): Promise<UploadApiResponse | undefined> => {
+    imageUri: string,
+  ): Promise<{ secure_url: string } | undefined> => {
     try {
-      const cld = new Cloudinary({
-        cloud: {
-          cloudName: process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME,
-          apiKey: process.env.CLOUDINARY_API_KEY,
-          apiSecret: process.env.CLOUDINARY_API_SECRET,
-        },
-        url: {
-          secure: true,
-        },
-      });
+      console.log('Iniciando proceso de subida de imagen...');
+      console.log('URI de la imagen:', imageUri);
 
-      let cloudinaryResponse;
+      // Paso 1: Construir el FormData para la subida
+      console.log('Construyendo FormData para la subida...');
+      const formData = new FormData();
+      const file: FileData = {
+        uri: imageUri,
+        type: 'image/jpeg', // Cambia el tipo si es necesario
+        name: 'upload.jpg',
+      };
 
-      await upload(cld, {
-        file: image,
-        callback: (
-          error?: UploadApiErrorResponse,
-          response?: UploadApiResponse,
-        ) => {
-          cloudinaryResponse = response;
+      formData.append('file', file as unknown as Blob); // Cloudinary espera un Blob o File
+      formData.append('upload_preset', 'unsigned_preset'); // Cambia esto por el nombre de tu preset unsigned
+      formData.append('api_key', process.env.CLOUDINARY_API_KEY || '');
+      formData.append('timestamp', Math.floor(Date.now() / 1000).toString());
+
+      console.log('FormData construido:', formData);
+
+      // Paso 2: Subir la imagen a Cloudinary
+      console.log('Subiendo imagen a Cloudinary...');
+      const response = await axios.post(
+        `https://api.cloudinary.com/v1_1/${process.env.NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME}/image/upload`,
+        formData,
+        {
+          headers: {
+            'Content-Type': 'multipart/form-data',
+          },
         },
-      });
+      );
+
+      console.log('Respuesta de Cloudinary:', response.data);
 
-      return cloudinaryResponse;
-    } catch (error) {
-      console.log(error);
+      return response.data; // Devuelve el objeto completo con secure_url
+    } catch (error: unknown) {
+      if (axios.isAxiosError(error)) {
+        console.error('Error al subir la imagen a Cloudinary:', error.message);
+        if (error.response) {
+          console.error('Detalles del error (response):', error.response.data);
+        } else if (error.request) {
+          console.error('Detalles del error (request):', error.request);
+        }
+      } else {
+        console.error('Error desconocido:', error);
+      }
+      return undefined;
     }
   },
 };

From 88c0e1e8fbbfac95e7dffaf928d7aa7b7a49f3a7 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 16 May 2025 11:26:28 -0400
Subject: [PATCH 214/291] babel.config fix

---
 babel.config.js | 29 ++++++++++++-----------------
 1 file changed, 12 insertions(+), 17 deletions(-)

diff --git a/babel.config.js b/babel.config.js
index 2cc16f5..96795d1 100644
--- a/babel.config.js
+++ b/babel.config.js
@@ -1,27 +1,22 @@
-const isProduction = process.env.NODE_ENV === 'production';
-const isDevelopmentBuild = process.env.EAS_BUILD_PROFILE === 'development';
-
 module.exports = function (api) {
   api.cache(true);
-
   return {
     presets: [
       ['babel-preset-expo', { jsxImportSource: 'nativewind' }],
       'nativewind/babel',
     ],
     plugins: [
-      !isProduction &&
-        !isDevelopmentBuild && [
-          'module:react-native-dotenv',
-          {
-            moduleName: '@env',
-            path: '.env',
-            blacklist: null,
-            whitelist: null,
-            safe: false,
-            allowUndefined: true,
-          },
-        ],
-    ].filter(Boolean),
+      [
+        'module:react-native-dotenv',
+        {
+          moduleName: '@env',
+          path: '.env',
+          blacklist: null,
+          whitelist: null,
+          safe: false,
+          allowUndefined: true,
+        },
+      ],
+    ],
   };
 };

From 443d8a15df3357c47ca3c47496812d7dff40709e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 16 May 2025 19:09:53 -0400
Subject: [PATCH 215/291] Add order status handling and websocket integration
 for real-time updates

---
 src/components/PaymentStatusMessage.tsx |  21 ++--
 src/hooks/useOrderSocket.ts             |  59 ++++++++++++
 src/screens/CheckoutScreen.tsx          | 122 +++++++-----------------
 src/utils/orderStatus.ts                |  20 ++++
 4 files changed, 128 insertions(+), 94 deletions(-)
 create mode 100644 src/hooks/useOrderSocket.ts
 create mode 100644 src/utils/orderStatus.ts

diff --git a/src/components/PaymentStatusMessage.tsx b/src/components/PaymentStatusMessage.tsx
index 9cb0f57..51748ba 100644
--- a/src/components/PaymentStatusMessage.tsx
+++ b/src/components/PaymentStatusMessage.tsx
@@ -12,7 +12,8 @@ type OrderStatus =
   | 'approved'
   | 'ready_for_pickup'
   | 'in_progress'
-  | 'rejected';
+  | 'canceled'
+  | 'completed';
 
 interface PaymentStatusMessageProps {
   orderStatus: OrderStatus;
@@ -32,11 +33,10 @@ const statusConfig: Record<
   requested: {
     icon: ClockIcon,
     color: theme.Colors.semanticWarning,
-    title: 'Orden En Espera',
+    title: 'Orden en espera',
     message: () =>
-      `Estamos procesando tu orden. En un momento actualizaremos el estado de tu orden  Si tienes alguna duda, por favor contacta a nuestro equipo de soporte.`,
+      `Estamos procesando tu orden. En un momento actualizaremos el estado de tu orden. Si tienes alguna duda, por favor contacta a nuestro equipo de soporte.`,
   },
-
   approved: {
     icon: CheckCircleIcon,
     color: theme.Colors.semanticSuccess,
@@ -54,17 +54,24 @@ const statusConfig: Record<
   in_progress: {
     icon: ClockIcon,
     color: theme.Colors.semanticWarning,
-    title: 'Orden En Espera',
+    title: 'Orden en progreso',
     message: () =>
-      'Tu pedido está en espera. Pronto comenzaremos a procesarlo.',
+      'Tu pedido está en progreso. Pronto comenzaremos a procesarlo.',
   },
-  rejected: {
+  canceled: {
     icon: XCircleIcon,
     color: theme.Colors.semanticDanger,
     title: 'Orden rechazada',
     message: () =>
       'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.',
   },
+  completed: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Orden completada',
+    message: (_orderNumber, userName) =>
+      `¡Gracias por tu compra, ${userName}! Tu orden ha sido completada exitosamente.`,
+  },
 };
 
 const PaymentStatusMessage: React.FC<PaymentStatusMessageProps> = ({
diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
new file mode 100644
index 0000000..ff7dd91
--- /dev/null
+++ b/src/hooks/useOrderSocket.ts
@@ -0,0 +1,59 @@
+// src/hooks/useOrderSocket.ts
+import { useEffect, useRef } from 'react';
+import io, { Socket } from 'socket.io-client';
+import * as SecureStore from 'expo-secure-store';
+import { SOCKET_URL } from '../lib/socketUrl';
+
+export type OrderStatus =
+  | 'requested'
+  | 'approved'
+  | 'ready_for_pickup'
+  | 'in_progress'
+  | 'canceled'
+  | 'completed';
+
+export interface Order {
+  id: string;
+  status: OrderStatus;
+  // …otros campos de la orden…
+}
+
+export function useOrderSocket(
+  orderId: string | null,
+  onOrderUpdate: (order: Order) => void,
+) {
+  const socketRef = useRef<Socket | null>(null);
+
+  useEffect(() => {
+    if (!orderId) return;
+    let isMounted = true;
+
+    SecureStore.getItemAsync('auth_token').then((token) => {
+      if (!isMounted || !token) return;
+      const sock = io(SOCKET_URL, {
+        transports: ['websocket'],
+        auth: { token },
+      });
+      socketRef.current = sock;
+
+      sock.on('connect', () => console.log('[WS] Conectado con ID:', sock.id));
+      sock.on('disconnect', (reason) =>
+        console.log('[WS] Desconectado:', reason),
+      );
+
+      sock.on('order', (updatedOrder: Order) => {
+        if (updatedOrder.id === orderId) {
+          console.log('[WS] Estado actualizado:', updatedOrder.status);
+          onOrderUpdate(updatedOrder);
+        }
+      });
+    });
+
+    return () => {
+      isMounted = false;
+      socketRef.current?.disconnect();
+    };
+  }, [orderId, onOrderUpdate]);
+
+  return socketRef.current;
+}
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index fee4794..f77862f 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -10,7 +10,6 @@ import {
 import {
   ShoppingBagIcon,
   TruckIcon,
-  MapPinIcon,
   ChevronLeftIcon,
 } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
@@ -46,6 +45,11 @@ import {
   setCouponDiscount,
   setCouponApplied,
 } from '../redux/slices/checkoutSlice';
+import {
+  useOrderSocket,
+  OrderStatus,
+  Order as OrderSocketType,
+} from '../hooks/useOrderSocket';
 
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -76,6 +80,10 @@ const CheckoutScreen = () => {
   const [emailVerificationModalVisible, setEmailVerificationModalVisible] =
     useState(false); // Track modal visibility
   const [orderStatus, setOrderStatus] = useState<string | null>(null);
+  // Suscribe al socket usando el hook; solo se conecta cuando orderNumber no es null
+  useOrderSocket(orderNumber, (updatedOrder: OrderSocketType) => {
+    setOrderStatus(updatedOrder.status);
+  });
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -259,10 +267,7 @@ const CheckoutScreen = () => {
           const orderDetail = await OrderService.getById(orderResponse.id);
           setOrderStatus(orderDetail.status); // <-- status real del backend
         } catch (err) {
-          console.error(
-            'No se pud          git checkout -b fix/sprint-5-checkout-fixeso obtener el status de la orden:',
-            err,
-          );
+          console.error('No se pudo obtener el status de la orden:', err);
           setOrderStatus(orderResponse.status ?? null);
         }
 
@@ -299,77 +304,21 @@ const CheckoutScreen = () => {
     }
   };
 
-  const handleOpenMapModal = () => {
-    if (selectedBranch) {
-      setModalVisible(true); // Open the modal only if a branch is selected
-    } else {
-      console.error('No branch selected to display on the map.');
-    }
-  };
-
-  const renderConfirmationContent = (orderStatus: string | null) => {
-    if (option === 'pickup' && orderStatus === 'approved') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Tu pedido ya está listo para que pases por él en la sucursal
-            indicada. En el mapa adjunto podrás ver la ubicación exacta para que
-            llegues sin problemas.
-          </PoppinsText>
-          <PoppinsText style={styles.sucursalText}>
-            Sucursal de retiro:{' '}
-            {selectedBranch?.name || '[Nombre de la sucursal]'}
-          </PoppinsText>
-          <Button
-            title="Ver Ubicación en el Mapa"
-            size="small"
-            style={styles.secondaryButton}
-            variant="secondary"
-            icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
-            onPress={handleOpenMapModal} // Open the modal
-          />
-        </>
-      );
-    }
-
-    if (option === 'delivery' && orderStatus === 'approved') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Estamos preparando tu pedido para enviarlo a la dirección indicada.
-          </PoppinsText>
-          <PoppinsText style={styles.confirmationMessage}>
-            Recibirás notificaciones cuando tu pedido esté en camino. En breve,
-            un motorizado tomará tu orden.
-          </PoppinsText>
-          <Button
-            title="Información del repartidor"
-            size="small"
-            style={styles.secondaryButton}
-            variant="secondary"
-            onPress={() => console.log('Información del repartidor')}
-          />
-        </>
-      );
+  //const handleOpenMapModal = () => {
+  //if (selectedBranch) {
+  //  setModalVisible(true); // Open the modal only if a branch is selected
+  // } else {
+  //  console.error('No branch selected to display on the map.');
+  //}
+  // };
+
+  const renderConfirmationContent = (status: OrderStatus | null) => {
+    if (status === 'approved' && option === 'pickup') {
+      return <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>;
     }
-
-    if (orderStatus === 'rejected') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Lamentamos informarte que hubo un problema al generar tu pedido.
-          </PoppinsText>
-          <Button
-            title="Volver a Intentar"
-            size="medium"
-            style={styles.primaryButton}
-            variant="primary"
-            onPress={() => console.log('Volver a Intentar')}
-          />
-        </>
-      );
+    if (status === 'approved' && option === 'delivery') {
+      return <PoppinsText>Tu pedido está en camino.</PoppinsText>;
     }
-
     return null;
   };
 
@@ -461,6 +410,15 @@ const CheckoutScreen = () => {
                 onSelect={(val) => dispatch(setLocationId(val))}
                 setSelectedBranch={setSelectedBranch}
               />
+              {/*               <Button
+                title="Ver Ubicación en el Mapa"
+                size="small"
+                style={styles.secondaryButton}
+                variant="secondary"
+                icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
+                onPress={handleOpenMapModal}
+              /> */}
+
               <View style={styles.paymentMethods}>
                 <PaymentMethods
                   selectedOption={option}
@@ -514,18 +472,11 @@ const CheckoutScreen = () => {
                 <PaymentStatusMessage
                   orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
                   userName={userName || 'Usuario'}
-                  orderStatus={
-                    orderStatus as
-                      | 'requested'
-                      | 'approved'
-                      | 'ready_for_pickup'
-                      | 'in_progress'
-                      | 'rejected'
-                  }
+                  orderStatus={orderStatus as OrderStatus}
                 />
               ) : null}
               <View style={styles.confirmationContainer}>
-                {renderConfirmationContent(orderStatus)}
+                {renderConfirmationContent(orderStatus as OrderStatus | null)}
               </View>
             </>
           )}
@@ -551,10 +502,7 @@ const CheckoutScreen = () => {
                   </View>
                 </>
               )}
-              <View style={styles.totalRow}>
-                {/* <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
-<PoppinsText style={styles.descuentoAmount}>+${iva.toFixed(2)}</PoppinsText> */}
-              </View>
+              <View style={styles.totalRow}></View>
               <View style={styles.totalRow}>
                 <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
                 <PoppinsText style={styles.totalAmount}>
diff --git a/src/utils/orderStatus.ts b/src/utils/orderStatus.ts
new file mode 100644
index 0000000..da0a8d4
--- /dev/null
+++ b/src/utils/orderStatus.ts
@@ -0,0 +1,20 @@
+// src/utils/orderStatus.ts
+import type { OrderStatus } from '../hooks/useOrderSocket';
+
+export const STATUS_LABELS: Record<OrderStatus, string> = {
+  requested: 'Esperando aprobación',
+  approved: 'Aprobada por admin',
+  ready_for_pickup: 'Listo para recoger',
+  in_progress: 'En progreso',
+  canceled: 'Cancelada',
+  completed: 'Completada',
+};
+
+// Para un Stepper lineal:
+export const STATUS_FLOW: OrderStatus[] = [
+  'requested',
+  'approved',
+  'ready_for_pickup',
+  'in_progress',
+  'completed',
+];

From 40e7bd5487ab4dafabf0dc8ed641944e87c40669 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 16 May 2025 19:38:16 -0400
Subject: [PATCH 216/291] Refactor useOrderSocket to enhance authorization
 handling and improve connection error logging

---
 src/hooks/useOrderSocket.ts | 24 +++++++++++++++++++++---
 1 file changed, 21 insertions(+), 3 deletions(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index ff7dd91..0643d05 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -15,9 +15,13 @@ export type OrderStatus =
 export interface Order {
   id: string;
   status: OrderStatus;
-  // …otros campos de la orden…
 }
 
+/**
+ * Hook para suscribirse a actualizaciones de estado de una orden vía Socket.IO
+ * - Envía el JWT en la cabecera `authorization` para polling y websocket
+ * - Captura errores de handshake
+ */
 export function useOrderSocket(
   orderId: string | null,
   onOrderUpdate: (order: Order) => void,
@@ -30,9 +34,20 @@ export function useOrderSocket(
 
     SecureStore.getItemAsync('auth_token').then((token) => {
       if (!isMounted || !token) return;
+
+      // Construimos la cabecera como en el cliente web
+      const authHeader = `Bearer ${token}`;
+
       const sock = io(SOCKET_URL, {
-        transports: ['websocket'],
-        auth: { token },
+        transportOptions: {
+          polling: {
+            extraHeaders: { authorization: authHeader },
+          },
+          websocket: {
+            extraHeaders: { authorization: authHeader },
+          },
+        },
+        // path: '/api/socket.io', // descomenta si tu gateway usa un path personalizado
       });
       socketRef.current = sock;
 
@@ -40,6 +55,9 @@ export function useOrderSocket(
       sock.on('disconnect', (reason) =>
         console.log('[WS] Desconectado:', reason),
       );
+      sock.on('connect_error', (err) =>
+        console.log('[WS] Error en handshake:', err.message),
+      );
 
       sock.on('order', (updatedOrder: Order) => {
         if (updatedOrder.id === orderId) {

From 6e0bb7727289f4e5d9f76ad4a9d34a45f4356e8c Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 16 May 2025 19:44:47 -0400
Subject: [PATCH 217/291] Refactor useOrderSocket to improve code clarity and
 enhance authorization handling

---
 src/hooks/useOrderSocket.ts | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 0643d05..1f19a87 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -17,11 +17,6 @@ export interface Order {
   status: OrderStatus;
 }
 
-/**
- * Hook para suscribirse a actualizaciones de estado de una orden vía Socket.IO
- * - Envía el JWT en la cabecera `authorization` para polling y websocket
- * - Captura errores de handshake
- */
 export function useOrderSocket(
   orderId: string | null,
   onOrderUpdate: (order: Order) => void,
@@ -35,19 +30,16 @@ export function useOrderSocket(
     SecureStore.getItemAsync('auth_token').then((token) => {
       if (!isMounted || !token) return;
 
-      // Construimos la cabecera como en el cliente web
       const authHeader = `Bearer ${token}`;
 
       const sock = io(SOCKET_URL, {
         transportOptions: {
           polling: {
-            extraHeaders: { authorization: authHeader },
-          },
-          websocket: {
-            extraHeaders: { authorization: authHeader },
+            extraHeaders: {
+              authorization: authHeader,
+            },
           },
         },
-        // path: '/api/socket.io', // descomenta si tu gateway usa un path personalizado
       });
       socketRef.current = sock;
 

From 559955bb38c2fbae319941cb7517bee0cc3a577e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 10:41:23 -0400
Subject: [PATCH 218/291] Update @pharmatech/sdk to version 0.4.18 and add
 paymentMethod to CheckoutScreen payload

---
 package-lock.json              | 9 ++++-----
 package.json                   | 2 +-
 src/screens/CheckoutScreen.tsx | 1 +
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index f4cd845..27968fb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.11",
+        "@pharmatech/sdk": "^0.4.18",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -4026,10 +4026,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
-      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
-      "license": "MIT",
+      "version": "0.4.18",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.18.tgz",
+      "integrity": "sha512-AfMYi7/6d/Iq7H3hk9UQNx3vmw+hDOn4R5VeVe9cnJnbxtWjoXXTizCIMRZHdMuRhsuEeJ2rd1odOcqOLzQ4Yg==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 917b07e..208c85a 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.11",
+    "@pharmatech/sdk": "^0.4.18",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index f77862f..23bc8f9 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -238,6 +238,7 @@ const CheckoutScreen = () => {
           userAddressId:
             option === 'delivery' ? locationId || undefined : undefined,
           products,
+          paymentMethod: payment, // <-- Agregado para cumplir con el SDK
         };
 
         // Log del payload que se enviará al backend

From cc8fdfb8ec662fa08f25fad15a8c936ebfa77938 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 11:08:41 -0400
Subject: [PATCH 219/291] Update CheckoutScreen to integrate paymentMethod with
 SDK and refactor orderPayload construction

---
 src/screens/CheckoutScreen.tsx | 13 ++++++++++---
 1 file changed, 10 insertions(+), 3 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 23bc8f9..15f97bd 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -27,7 +27,13 @@ import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
 import { UserService } from '../services/user';
-import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
+import {
+  OrderType,
+  CreateOrder as SdkCreateOrder,
+  CreateOrderDetail,
+  PaymentMethod,
+} from '@pharmatech/sdk';
+
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
@@ -232,13 +238,14 @@ const CheckoutScreen = () => {
         console.log('Productos seleccionados para la orden:', products);
 
         // Construir el payload de la orden
-        const orderPayload: CreateOrder = {
+        const orderPayload: SdkCreateOrder = {
           type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
+          paymentMethod:
+            payment === 'efectivo' ? PaymentMethod.CASH : PaymentMethod.CARD,
           branchId: option === 'pickup' ? locationId || undefined : undefined,
           userAddressId:
             option === 'delivery' ? locationId || undefined : undefined,
           products,
-          paymentMethod: payment, // <-- Agregado para cumplir con el SDK
         };
 
         // Log del payload que se enviará al backend

From 2ca4c657f5f7ea9cf6481aeb618c9677aa8db2bb Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 11:39:06 -0400
Subject: [PATCH 220/291] Refactor useOrderSocket to improve token handling,
 add event logging, and enhance cleanup process; update SOCKET_URL to use
 HTTPS

---
 src/hooks/useOrderSocket.ts | 22 ++++++++++++++++------
 src/lib/socketUrl.ts        |  4 ++--
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 1f19a87..14de9bf 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -20,27 +20,28 @@ export interface Order {
 export function useOrderSocket(
   orderId: string | null,
   onOrderUpdate: (order: Order) => void,
-) {
+): Socket | null {
   const socketRef = useRef<Socket | null>(null);
 
   useEffect(() => {
     if (!orderId) return;
     let isMounted = true;
 
-    SecureStore.getItemAsync('auth_token').then((token) => {
+    const setupSocket = async () => {
+      const token = await SecureStore.getItemAsync('auth_token');
       if (!isMounted || !token) return;
 
       const authHeader = `Bearer ${token}`;
 
       const sock = io(SOCKET_URL, {
+        // Permitimos HTTP polling para que extraHeaders funcione
         transportOptions: {
           polling: {
-            extraHeaders: {
-              authorization: authHeader,
-            },
+            extraHeaders: { Authorization: authHeader },
           },
         },
       });
+
       socketRef.current = sock;
 
       sock.on('connect', () => console.log('[WS] Conectado con ID:', sock.id));
@@ -51,17 +52,26 @@ export function useOrderSocket(
         console.log('[WS] Error en handshake:', err.message),
       );
 
+      // Debug: ver todos los eventos que llegan
+      sock.onAny((event, ...args) =>
+        console.log('[WS] evento recibido:', event, args),
+      );
+
       sock.on('order', (updatedOrder: Order) => {
         if (updatedOrder.id === orderId) {
           console.log('[WS] Estado actualizado:', updatedOrder.status);
           onOrderUpdate(updatedOrder);
         }
       });
-    });
+    };
+
+    setupSocket();
 
     return () => {
       isMounted = false;
+      socketRef.current?.offAny();
       socketRef.current?.disconnect();
+      socketRef.current = null;
     };
   }, [orderId, onOrderUpdate]);
 
diff --git a/src/lib/socketUrl.ts b/src/lib/socketUrl.ts
index 65016c6..7788574 100644
--- a/src/lib/socketUrl.ts
+++ b/src/lib/socketUrl.ts
@@ -1,5 +1,5 @@
 const devModeFlag = process.env.PHARMATECH_DEV_MODE === 'true';
-const devUrl = 'ws://api-dev-8jfx.onrender.com';
-const prodUrl = 'ws://api-d8h5.onrender.com';
+const devUrl = 'https://api-dev-8jfx.onrender.com';
+const prodUrl = 'https://api-d8h5.onrender.com';
 
 export const SOCKET_URL = devModeFlag ? devUrl : prodUrl;

From 06f9ba161cf40281b3275fbab41c588a50897991 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 11:45:46 -0400
Subject: [PATCH 221/291] Remove unnecessary comment in useOrderSocket and add
 a blank line in socketUrl for improved readability

---
 src/hooks/useOrderSocket.ts | 1 -
 src/lib/socketUrl.ts        | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 14de9bf..36d2ecb 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -34,7 +34,6 @@ export function useOrderSocket(
       const authHeader = `Bearer ${token}`;
 
       const sock = io(SOCKET_URL, {
-        // Permitimos HTTP polling para que extraHeaders funcione
         transportOptions: {
           polling: {
             extraHeaders: { Authorization: authHeader },
diff --git a/src/lib/socketUrl.ts b/src/lib/socketUrl.ts
index 7788574..77fccb4 100644
--- a/src/lib/socketUrl.ts
+++ b/src/lib/socketUrl.ts
@@ -1,4 +1,5 @@
 const devModeFlag = process.env.PHARMATECH_DEV_MODE === 'true';
+
 const devUrl = 'https://api-dev-8jfx.onrender.com';
 const prodUrl = 'https://api-d8h5.onrender.com';
 

From 09dc66eee2f3c840d1a46862209383dee943d428 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 13:36:22 -0400
Subject: [PATCH 222/291] Refactor useOrderSocket to improve readability and
 memoization of order update handler; streamline socket setup and cleanup
 process

---
 src/hooks/useOrderSocket.ts | 40 +++++++++++++++++++++++--------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 36d2ecb..032f194 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -1,5 +1,5 @@
 // src/hooks/useOrderSocket.ts
-import { useEffect, useRef } from 'react';
+import { useEffect, useRef, useCallback } from 'react';
 import io, { Socket } from 'socket.io-client';
 import * as SecureStore from 'expo-secure-store';
 import { SOCKET_URL } from '../lib/socketUrl';
@@ -23,16 +23,26 @@ export function useOrderSocket(
 ): Socket | null {
   const socketRef = useRef<Socket | null>(null);
 
+  // Memoize the handler to avoid re-subscribing on every render
+  const handleOrderUpdate = useCallback(
+    (updatedOrder: Order) => {
+      if (updatedOrder.id === orderId) {
+        console.log('[WS] Estado actualizado:', updatedOrder.status);
+        onOrderUpdate(updatedOrder);
+      }
+    },
+    [onOrderUpdate, orderId],
+  );
+
   useEffect(() => {
     if (!orderId) return;
     let isMounted = true;
 
-    const setupSocket = async () => {
+    (async () => {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!isMounted || !token) return;
 
       const authHeader = `Bearer ${token}`;
-
       const sock = io(SOCKET_URL, {
         transportOptions: {
           polling: {
@@ -56,23 +66,23 @@ export function useOrderSocket(
         console.log('[WS] evento recibido:', event, args),
       );
 
-      sock.on('order', (updatedOrder: Order) => {
-        if (updatedOrder.id === orderId) {
-          console.log('[WS] Estado actualizado:', updatedOrder.status);
-          onOrderUpdate(updatedOrder);
-        }
-      });
-    };
-
-    setupSocket();
+      sock.on('order', handleOrderUpdate);
+    })();
 
     return () => {
       isMounted = false;
-      socketRef.current?.offAny();
-      socketRef.current?.disconnect();
+      const sock = socketRef.current;
+      if (sock) {
+        sock.off('connect');
+        sock.off('disconnect');
+        sock.off('connect_error');
+        sock.offAny();
+        sock.off('order', handleOrderUpdate);
+        sock.disconnect();
+      }
       socketRef.current = null;
     };
-  }, [orderId, onOrderUpdate]);
+  }, [orderId, handleOrderUpdate]);
 
   return socketRef.current;
 }

From b96f2f676a7055d5bfb5b01839110da44f07f830 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 17 May 2025 18:17:20 -0400
Subject: [PATCH 223/291] Creating new tabBar and doing fixes

---
 src/app/(delivery-tabs)/_layout.tsx           |  29 +---
 src/app/(delivery-tabs)/deliverySupport.tsx   |   6 -
 src/app/(tabs)/_layout.tsx                    |  20 +--
 src/app/(tabs)/support.tsx                    |   7 -
 src/app/_layout.tsx                           |  50 +++----
 src/components/TabBar.tsx                     | 140 ++++++++++++++++++
 src/components/TabBarButton.tsx               |  94 ++++++++++++
 src/constants/icon.tsx                        |  22 +++
 src/screens/ActiveOrdersScreen.tsx            |   2 +-
 src/screens/CartListScreen.tsx                |   1 +
 src/screens/DirectionChangeScreen.tsx         |   2 +-
 src/screens/DirectionCreateScreen.tsx         |   2 +-
 src/screens/DirectionScreen.tsx               |   2 +-
 .../LoggedInPasswordRecoveryScreen.tsx        |   1 -
 src/screens/MenuScreen.tsx                    |   1 -
 src/screens/OrderDetailScreen.tsx             |   2 +-
 src/screens/OrdersScreen.tsx                  |   2 +-
 src/screens/PasswordChangeScreen.tsx          |   2 +-
 src/screens/ProfileScreen.tsx                 |   2 +-
 src/screens/SelectLocationScreen.tsx          |  25 +++-
 .../delivery/DeliveryHistoryScreen.tsx        |   4 +
 src/screens/delivery/DeliveryHomeScreen.tsx   |   4 +
 .../delivery/DeliverySupportScreen.tsx        |  21 ---
 src/screens/tab/BranchesScreen.tsx            |   4 +
 src/screens/tab/CategoriesScreen.tsx          |   4 +
 src/screens/tab/HomeScreen.tsx                |   4 +
 src/screens/tab/OffersScreen.tsx              |   4 +
 src/screens/tab/SupportScreen.tsx             |  21 ---
 src/styles/theme.ts                           |   4 +
 29 files changed, 338 insertions(+), 144 deletions(-)
 delete mode 100644 src/app/(delivery-tabs)/deliverySupport.tsx
 delete mode 100644 src/app/(tabs)/support.tsx
 create mode 100644 src/components/TabBar.tsx
 create mode 100644 src/components/TabBarButton.tsx
 create mode 100644 src/constants/icon.tsx
 delete mode 100644 src/screens/delivery/DeliverySupportScreen.tsx
 delete mode 100644 src/screens/tab/SupportScreen.tsx

diff --git a/src/app/(delivery-tabs)/_layout.tsx b/src/app/(delivery-tabs)/_layout.tsx
index 9e1243f..14b1f43 100644
--- a/src/app/(delivery-tabs)/_layout.tsx
+++ b/src/app/(delivery-tabs)/_layout.tsx
@@ -3,25 +3,17 @@ import { Tabs } from 'expo-router';
 import { View, StyleSheet } from 'react-native';
 import { Colors } from '../../styles/theme';
 import PoppinsText from '../../components/PoppinsText';
-import {
-  HomeIcon,
-  ClockIcon,
-  LifebuoyIcon,
-} from 'react-native-heroicons/outline';
+import { HomeIcon, ClockIcon } from 'react-native-heroicons/outline';
 import TopBarDelivery from '../../components/TopBarDelivery';
 import { AlertProvider } from '../../components/AlertProvider'; // Importar el AlertProvider
+import { TabBar } from '../../components/TabBar';
 
 export default function DeliveryTabLayout() {
   return (
     <AlertProvider>
       <View style={styles.container}>
         <TopBarDelivery />
-        <Tabs
-          screenOptions={{
-            tabBarActiveTintColor: Colors.primary,
-            tabBarStyle: { backgroundColor: Colors.secondaryWhite },
-          }}
-        >
+        <Tabs tabBar={(props) => <TabBar {...props} />}>
           <Tabs.Screen
             name="index"
             options={{
@@ -52,21 +44,6 @@ export default function DeliveryTabLayout() {
               ),
             }}
           />
-          <Tabs.Screen
-            name="deliverySupport"
-            options={{
-              tabBarLabel: ({ color }) => (
-                <PoppinsText style={{ color: color, fontSize: 10 }}>
-                  Soporte
-                </PoppinsText>
-              ),
-              headerShown: false,
-              title: 'Soporte',
-              tabBarIcon: () => (
-                <LifebuoyIcon width={24} height={24} color={Colors.primary} />
-              ),
-            }}
-          />
         </Tabs>
       </View>
     </AlertProvider>
diff --git a/src/app/(delivery-tabs)/deliverySupport.tsx b/src/app/(delivery-tabs)/deliverySupport.tsx
deleted file mode 100644
index fae268e..0000000
--- a/src/app/(delivery-tabs)/deliverySupport.tsx
+++ /dev/null
@@ -1,6 +0,0 @@
-import React from 'react';
-import DeliverySupportScreen from '../../screens/delivery/DeliverySupportScreen';
-
-export default function DeliverySupport() {
-  return <DeliverySupportScreen />;
-}
diff --git a/src/app/(tabs)/_layout.tsx b/src/app/(tabs)/_layout.tsx
index ae1c79b..27b9f64 100644
--- a/src/app/(tabs)/_layout.tsx
+++ b/src/app/(tabs)/_layout.tsx
@@ -3,22 +3,21 @@ import {
   ListBulletIcon,
   MapPinIcon,
   TagIcon,
-  LifebuoyIcon,
 } from 'react-native-heroicons/outline';
 import { Tabs } from 'expo-router';
 import { Colors } from '../../styles/theme';
 import PoppinsText from '../../components/PoppinsText';
 import { View, StyleSheet } from 'react-native';
 import TopBar from '../../components/TopBar';
+import { TabBar } from '../../components/TabBar';
 
 export default function TabLayout() {
   return (
     <View style={styles.container}>
       <TopBar />
       <Tabs
+        tabBar={(props) => <TabBar {...props} />} // Siempre renderiza la TabBar
         screenOptions={{
-          tabBarActiveTintColor: Colors.primary,
-          tabBarStyle: { backgroundColor: Colors.secondaryWhite },
           tabBarHideOnKeyboard: true,
           tabBarVisibilityAnimationConfig: {
             show: {
@@ -93,21 +92,6 @@ export default function TabLayout() {
             ),
           }}
         />
-        <Tabs.Screen
-          name="support"
-          options={{
-            tabBarLabel: ({ color }) => (
-              <PoppinsText style={{ color: color, fontSize: 10 }}>
-                Soporte
-              </PoppinsText>
-            ),
-            title: 'Soporte',
-            headerShown: false,
-            tabBarIcon: () => (
-              <LifebuoyIcon width={24} height={24} color={Colors.primary} />
-            ),
-          }}
-        />
       </Tabs>
     </View>
   );
diff --git a/src/app/(tabs)/support.tsx b/src/app/(tabs)/support.tsx
deleted file mode 100644
index 600e4de..0000000
--- a/src/app/(tabs)/support.tsx
+++ /dev/null
@@ -1,7 +0,0 @@
-// app/(tabs)/support.tsx
-import React from 'react';
-import SupportScreen from '../../screens/tab/SupportScreen';
-
-export default function TabsHome() {
-  return <SupportScreen />;
-}
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index a9c0b94..7fe2879 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -55,6 +55,10 @@ export default function RootLayout() {
         <Stack
           screenOptions={({ navigation }) => ({
             headerBackVisible: false,
+            headerStyle: {
+              backgroundColor: Colors.bgColor, // Color específico para esta pantalla
+            },
+            headerShadowVisible: false,
             headerLeft: () =>
               navigation.canGoBack() ? (
                 <TouchableOpacity
@@ -80,10 +84,7 @@ export default function RootLayout() {
           <Stack.Screen name="(tabs)" options={{ headerShown: false }} />
           <Stack.Screen name="products" options={{ headerShown: false }} />
           <Stack.Screen name="search" options={{ headerShown: false }} />
-          <Stack.Screen
-            name="profile"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
+          <Stack.Screen name="profile" options={{ headerTitle: '' }} />
           <Stack.Screen
             name="notifications"
             options={{
@@ -94,32 +95,20 @@ export default function RootLayout() {
           />
           <Stack.Screen
             name="menu"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
-          <Stack.Screen
-            name="direction"
-            options={{ headerTitle: '', headerTransparent: true }}
+            options={{
+              headerTitle: '',
+              headerShadowVisible: false,
+            }}
           />
+          <Stack.Screen name="direction" options={{ headerTitle: '' }} />
           <Stack.Screen
             name="selectLocation"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
-          <Stack.Screen
-            name="createDirection"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
-          <Stack.Screen
-            name="orders"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
-          <Stack.Screen
-            name="order"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
-          <Stack.Screen
-            name="change-direction"
-            options={{ headerTitle: '', headerTransparent: true }}
+            options={{ headerTitle: '', headerShown: false }}
           />
+          <Stack.Screen name="createDirection" options={{ headerTitle: '' }} />
+          <Stack.Screen name="orders" options={{ headerTitle: '' }} />
+          <Stack.Screen name="order" options={{ headerTitle: '' }} />
+          <Stack.Screen name="change-direction" options={{ headerTitle: '' }} />
           <Stack.Screen
             name="register"
             options={{ headerTitle: '', headerTransparent: true }}
@@ -130,7 +119,7 @@ export default function RootLayout() {
           />
           <Stack.Screen
             name="loggedInPasswordRecovery"
-            options={{ headerTitle: '', headerTransparent: true }}
+            options={{ headerTitle: '' }}
           />
           <Stack.Screen
             name="success"
@@ -140,7 +129,6 @@ export default function RootLayout() {
             name="cart"
             options={({ navigation }) => ({
               headerTitle: '',
-              headerTransparent: true,
               headerLeft: undefined,
               headerRight: () => (
                 <TouchableOpacity onPress={() => navigation.goBack()}>
@@ -149,10 +137,7 @@ export default function RootLayout() {
               ),
             })}
           />
-          <Stack.Screen
-            name="change-password"
-            options={{ headerTitle: '', headerTransparent: true }}
-          />
+          <Stack.Screen name="change-password" options={{ headerTitle: '' }} />
           <Stack.Screen
             name="(delivery-tabs)"
             options={{ headerShown: false }}
@@ -179,7 +164,6 @@ export default function RootLayout() {
             name="active-orders"
             options={{
               headerTitle: '',
-              headerTransparent: true,
             }}
           />
         </Stack>
diff --git a/src/components/TabBar.tsx b/src/components/TabBar.tsx
new file mode 100644
index 0000000..c34528f
--- /dev/null
+++ b/src/components/TabBar.tsx
@@ -0,0 +1,140 @@
+import { View, StyleSheet, LayoutChangeEvent } from 'react-native';
+import { BottomTabBarProps } from '@react-navigation/bottom-tabs';
+import { Colors } from '../styles/theme';
+import { useState } from 'react';
+import TabBarButton from './TabBarButton';
+import Animated, {
+  useAnimatedStyle,
+  useSharedValue,
+  withTiming,
+} from 'react-native-reanimated';
+
+export function TabBar({ state, descriptors, navigation }: BottomTabBarProps) {
+  const currentRoute = state.routes[state.index].name;
+
+  // Oculta la TabBar en pantallas específicas
+  const hiddenRoutes = ['menu', 'cart']; // Agrega aquí las rutas donde no quieres mostrar la TabBar
+  if (hiddenRoutes.includes(currentRoute)) {
+    return null; // No renderiza la TabBar
+  }
+
+  const [dimensions, setDimensions] = useState({ width: 10, height: 20 });
+
+  const buttonWidth = dimensions.width / state.routes.length;
+
+  const onTabBarLayout = (e: LayoutChangeEvent) => {
+    setDimensions({
+      width: e.nativeEvent.layout.width,
+      height: e.nativeEvent.layout.height,
+    });
+  };
+
+  const tabPositionX = useSharedValue(0);
+
+  const animatedStyle = useAnimatedStyle(() => ({
+    transform: [
+      {
+        translateX: tabPositionX.value + 16,
+      },
+    ],
+  }));
+
+  return (
+    <View onLayout={onTabBarLayout} style={styles.tabBar}>
+      <Animated.View
+        style={[
+          animatedStyle,
+          {
+            position: 'absolute',
+            width: buttonWidth - 32,
+            height: dimensions.height - 20,
+            backgroundColor: Colors.tertiary_400,
+            borderRadius: 30,
+          },
+        ]}
+      />
+      {state.routes.map((route, index) => {
+        const { options } = descriptors[route.key];
+        const label =
+          options.tabBarLabel !== undefined
+            ? options.tabBarLabel
+            : options.title !== undefined
+              ? options.title
+              : route.name;
+
+        const isFocused = state.index === index;
+
+        const onPress = () => {
+          tabPositionX.value = withTiming(buttonWidth * index, {
+            duration: 350,
+          });
+
+          const event = navigation.emit({
+            type: 'tabPress',
+            target: route.key,
+            canPreventDefault: true,
+          });
+
+          if (!isFocused && !event.defaultPrevented) {
+            navigation.navigate(route.name, route.params);
+          }
+        };
+
+        const onLongPress = () => {
+          navigation.emit({
+            type: 'tabLongPress',
+            target: route.key,
+          });
+        };
+
+        return (
+          <TabBarButton
+            key={route.name}
+            onPress={onPress}
+            onLongPress={onLongPress}
+            isFocused={isFocused}
+            routeName={
+              route.name as 'index' | 'categories' | 'branches' | 'offers'
+            }
+            color={isFocused ? Colors.primary : Colors.textLowContrast}
+            label={
+              typeof label === 'function'
+                ? (props) =>
+                    label({
+                      ...props,
+                      position: props.position as 'beside-icon' | 'below-icon',
+                    })
+                : label
+            }
+          />
+        );
+      })}
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  tabBar: {
+    position: 'absolute',
+    flexDirection: 'row',
+    bottom: 0,
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    borderColor: Colors.gray_100,
+    borderTopWidth: 1,
+    backgroundColor: Colors.menuWhite,
+    paddingVertical: 6,
+    shadowColor: '#000',
+    shadowOffset: {
+      width: 0,
+      height: 10,
+    },
+    shadowOpacity: 0.1,
+    shadowRadius: 10,
+  },
+  // tabBarItem: {
+  //   flex: 1,
+  //   justifyContent: 'center',
+  //   alignItems: 'center',
+  // },
+});
diff --git a/src/components/TabBarButton.tsx b/src/components/TabBarButton.tsx
new file mode 100644
index 0000000..d11c631
--- /dev/null
+++ b/src/components/TabBarButton.tsx
@@ -0,0 +1,94 @@
+import { Pressable, StyleSheet, GestureResponderEvent } from 'react-native';
+import Animated from 'react-native-reanimated';
+import React, { useEffect } from 'react';
+import { icon } from '../constants/icon';
+import {
+  interpolate,
+  useAnimatedStyle,
+  useSharedValue,
+  withSpring,
+} from 'react-native-reanimated';
+import { Colors } from '../styles/theme';
+
+const TabBarButton = ({
+  onPress,
+  onLongPress,
+  isFocused,
+  routeName,
+  label,
+}: {
+  onPress: (event: GestureResponderEvent) => void;
+  onLongPress: (event: GestureResponderEvent) => void;
+  isFocused: boolean;
+  routeName: keyof typeof icon;
+  color: string;
+  label:
+    | string
+    | ((args: {
+        focused: boolean;
+        color: string;
+        position: string;
+        children: string;
+      }) => React.ReactNode);
+}) => {
+  const scale = useSharedValue(0);
+
+  useEffect(() => {
+    scale.value = withSpring(
+      typeof isFocused === 'boolean' ? (isFocused ? 1 : 0) : isFocused,
+      { duration: 350 },
+    );
+  }, [scale, isFocused]);
+
+  const animatedIconStyle = useAnimatedStyle(() => {
+    const scaleValue = interpolate(scale.value, [0, 1], [1, 1.2]);
+
+    const top = interpolate(scale.value, [0, 1], [0, 9]);
+    return {
+      transform: [{ scale: scaleValue }],
+      top,
+    };
+  });
+
+  const animatedTextStyle = useAnimatedStyle(() => {
+    const opacity = interpolate(scale.value, [0, 1], [1, 0]);
+    return {
+      opacity,
+    };
+  });
+  return (
+    <Pressable
+      onPress={onPress}
+      onLongPress={onLongPress}
+      style={styles.tabBarItem}
+    >
+      <Animated.View style={animatedIconStyle}>
+        {icon[routeName]({
+          color: isFocused ? Colors.menuWhite : Colors.primary,
+        })}
+      </Animated.View>
+
+      <Animated.Text style={animatedTextStyle}>
+        {typeof label === 'function'
+          ? label({
+              focused: isFocused,
+              color: isFocused ? Colors.primary : Colors.primary,
+              position: 'beside-icon',
+              children: '',
+            })
+          : label}
+      </Animated.Text>
+    </Pressable>
+  );
+};
+
+export default TabBarButton;
+
+const styles = StyleSheet.create({
+  tabBarItem: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    paddingVertical: 6,
+  },
+});
diff --git a/src/constants/icon.tsx b/src/constants/icon.tsx
new file mode 100644
index 0000000..45386e5
--- /dev/null
+++ b/src/constants/icon.tsx
@@ -0,0 +1,22 @@
+import { Feather } from '@expo/vector-icons';
+import type { ComponentProps } from 'react';
+
+type FeatherIconProps = Omit<ComponentProps<typeof Feather>, 'name'>;
+
+export const icon = {
+  index: (props: FeatherIconProps) => (
+    <Feather name="home" size={24} {...props} />
+  ),
+  categories: (props: FeatherIconProps) => (
+    <Feather name="list" size={24} {...props} />
+  ),
+  branches: (props: FeatherIconProps) => (
+    <Feather name="map-pin" size={24} {...props} />
+  ),
+  offers: (props: FeatherIconProps) => (
+    <Feather name="tag" size={24} {...props} />
+  ),
+  deliveryHistory: (props: FeatherIconProps) => (
+    <Feather name="clock" size={24} {...props} />
+  ),
+};
diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 51bd3eb..a5fc103 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -171,6 +171,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -183,7 +184,6 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   orderInfo: {
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index c2151aa..b5a6f51 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -153,6 +153,7 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
     padding: 16,
+    paddingTop: -16,
   },
   header: {
     fontSize: FontSizes.h5.size,
diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 26ebc2b..df541bd 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -251,6 +251,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -263,7 +264,6 @@ const styles = StyleSheet.create({
   },
   addressHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   addressImage: {
diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index 35f3ca8..8488348 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -207,6 +207,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -219,7 +220,6 @@ const styles = StyleSheet.create({
   },
   addressHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   addressInfo: {
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index 8653b6b..998c23c 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -191,6 +191,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -203,7 +204,6 @@ const styles = StyleSheet.create({
   },
   directionHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   directionInfo: {
diff --git a/src/screens/LoggedInPasswordRecoveryScreen.tsx b/src/screens/LoggedInPasswordRecoveryScreen.tsx
index e2b2096..880e6f5 100644
--- a/src/screens/LoggedInPasswordRecoveryScreen.tsx
+++ b/src/screens/LoggedInPasswordRecoveryScreen.tsx
@@ -296,7 +296,6 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     justifyContent: 'flex-start',
-    paddingTop: 56,
     paddingHorizontal: 20,
   },
   stepsWrapper: {
diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
index a7bc1ab..761691f 100644
--- a/src/screens/MenuScreen.tsx
+++ b/src/screens/MenuScreen.tsx
@@ -214,7 +214,6 @@ const styles = StyleSheet.create({
   },
   menuContent: {
     flex: 1,
-    marginTop: 40,
     paddingHorizontal: 10,
     justifyContent: 'space-between',
   },
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 2a4d39b..6dddebc 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -234,6 +234,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
     paddingBottom: 0,
   },
   alertContainer: {
@@ -253,7 +254,6 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   orderImage: {
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index d7dfa26..73a5600 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -197,6 +197,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -209,7 +210,6 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   orderInfo: {
diff --git a/src/screens/PasswordChangeScreen.tsx b/src/screens/PasswordChangeScreen.tsx
index 595e918..9e35277 100644
--- a/src/screens/PasswordChangeScreen.tsx
+++ b/src/screens/PasswordChangeScreen.tsx
@@ -207,7 +207,7 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.bgColor,
     justifyContent: 'flex-start',
     alignItems: 'center',
-    paddingTop: 100,
+    paddingTop: 32,
     paddingHorizontal: 20,
   },
   alertContainer: {
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index ee10956..1e60176 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -311,6 +311,7 @@ const styles = StyleSheet.create({
     flexGrow: 1,
     backgroundColor: Colors.bgColor,
     padding: 20,
+    paddingTop: -20,
   },
   alertContainer: {
     position: 'absolute',
@@ -323,7 +324,6 @@ const styles = StyleSheet.create({
   },
   profileHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   profileImage: {
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index a85b204..dfa43b3 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useState, useRef, useEffect } from 'react';
-import { StyleSheet, View, TextInput, Alert } from 'react-native';
+import {
+  StyleSheet,
+  View,
+  TextInput,
+  Alert,
+  TouchableOpacity,
+} from 'react-native';
 import MapView, { PROVIDER_GOOGLE, Region } from 'react-native-maps'; // Importa el tipo Region
 import * as Location from 'expo-location';
 import { useRouter } from 'expo-router';
@@ -8,10 +14,14 @@ import { MapPinIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { Config } from '../config';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+import { useNavigation } from '@react-navigation/native';
 
 const SelectLocationScreen = () => {
   console.log('Clave de API utilizada:', Config.googleMapsApiKey);
 
+  const navigation = useNavigation();
+
   const [selectedLocation, setSelectedLocation] = useState<{
     latitude: number;
     longitude: number;
@@ -129,6 +139,15 @@ const SelectLocationScreen = () => {
     <View style={styles.container}>
       {/* Header con input para mostrar la dirección */}
       <View style={styles.header}>
+        <TouchableOpacity
+          onPress={navigation.goBack}
+          style={{
+            marginTop: 4,
+            marginLeft: 4,
+          }}
+        >
+          <ChevronLeftIcon width={28} height={28} color="#000" />
+        </TouchableOpacity>
         <TextInput
           style={styles.addressInput}
           value={address}
@@ -177,6 +196,7 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.textWhite,
     padding: 10,
     zIndex: 1000,
+    flexDirection: 'row',
   },
   addressInput: {
     backgroundColor: Colors.menuWhite,
@@ -188,7 +208,8 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.label.lineHeight,
     fontFamily: 'Poppins_400Regular',
     color: Colors.textMain,
-    marginLeft: 48,
+    marginLeft: 14,
+    flex: 1,
   },
   map: {
     ...StyleSheet.absoluteFillObject,
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 482b988..95dea26 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -139,6 +139,7 @@ const DeliveryHistoryScreen: React.FC = () => {
             />
           ))
         )}
+        <View style={styles.height} />
       </ScrollView>
     </View>
   );
@@ -172,6 +173,9 @@ const styles = StyleSheet.create({
     padding: 16,
     marginHorizontal: 4,
   },
+  height: {
+    height: 64,
+  },
   title: {
     fontSize: FontSizes.h5.size,
     lineHeight: FontSizes.h5.lineHeight,
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index 3f63b72..43e9d0f 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -205,6 +205,7 @@ export default function DeliveryHomeScreen() {
             />
           ))
         )}
+        <View style={styles.height} />
       </ScrollView>
 
       {/* Popup de confirmación para descartar orden */}
@@ -233,6 +234,9 @@ const styles = StyleSheet.create({
     padding: 16,
     marginHorizontal: 4,
   },
+  height: {
+    height: 64,
+  },
   title: {
     fontSize: FontSizes.h5.size,
     lineHeight: FontSizes.h5.lineHeight,
diff --git a/src/screens/delivery/DeliverySupportScreen.tsx b/src/screens/delivery/DeliverySupportScreen.tsx
deleted file mode 100644
index 5b841c7..0000000
--- a/src/screens/delivery/DeliverySupportScreen.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
-import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
-
-export default function SupportScreen() {
-  return (
-    <View style={styles.container}>
-      <PoppinsText>Pantalla Soporte</PoppinsText>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: Colors.bgColor,
-  },
-});
diff --git a/src/screens/tab/BranchesScreen.tsx b/src/screens/tab/BranchesScreen.tsx
index f74e03d..9d70be8 100644
--- a/src/screens/tab/BranchesScreen.tsx
+++ b/src/screens/tab/BranchesScreen.tsx
@@ -144,6 +144,7 @@ export default function BranchesScreen() {
           </View>
         </View>
       </Modal>
+      <View style={styles.height} />
     </View>
   );
 }
@@ -155,6 +156,9 @@ const styles = StyleSheet.create({
     padding: 16,
     paddingTop: -16,
   },
+  height: {
+    height: 64,
+  },
   title: {
     fontSize: FontSizes.s1.size,
     lineHeight: FontSizes.s1.lineHeight,
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index f446b72..7f5517f 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -80,6 +80,7 @@ export default function CategoriesScreen() {
         showsVerticalScrollIndicator={true}
         alwaysBounceVertical={true}
       />
+      <View style={styles.height} />
     </View>
   );
 }
@@ -89,6 +90,9 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.bgColor,
     flex: 1,
   },
+  height: {
+    height: 64,
+  },
   alertContainer: {
     position: 'absolute',
     width: 326,
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index ad91bf1..8d1e2de 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -216,6 +216,7 @@ export default function HomeScreen() {
             )}
           </View>
         </View>
+        <View style={styles.height} />
       </ScrollView>
       <EmailVerificationModal
         visible={showEmailVerification}
@@ -231,6 +232,9 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.bgColor,
     paddingLeft: 5,
   },
+  height: {
+    height: 64,
+  },
   loadingContainer: {
     flex: 1,
     justifyContent: 'center',
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 9ca0574..7a74c8c 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -7,6 +7,7 @@ export default function OffersScreen() {
   return (
     <View style={styles.container}>
       <PoppinsText>Pantalla Ofertas</PoppinsText>
+      <View style={styles.height} />
     </View>
   );
 }
@@ -18,4 +19,7 @@ const styles = StyleSheet.create({
     alignItems: 'center',
     backgroundColor: Colors.bgColor,
   },
+  height: {
+    height: 64,
+  },
 });
diff --git a/src/screens/tab/SupportScreen.tsx b/src/screens/tab/SupportScreen.tsx
deleted file mode 100644
index ee0cf25..0000000
--- a/src/screens/tab/SupportScreen.tsx
+++ /dev/null
@@ -1,21 +0,0 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
-import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
-
-export default function SupportScreen() {
-  return (
-    <View style={styles.container}>
-      <PoppinsText>Pantalla Ofertas</PoppinsText>
-    </View>
-  );
-}
-
-const styles = StyleSheet.create({
-  container: {
-    flex: 1,
-    justifyContent: 'center',
-    alignItems: 'center',
-    backgroundColor: Colors.bgColor,
-  },
-});
diff --git a/src/styles/theme.ts b/src/styles/theme.ts
index 22a60be..c41121f 100644
--- a/src/styles/theme.ts
+++ b/src/styles/theme.ts
@@ -36,6 +36,10 @@ export const Colors = {
   gray_100: '#E7E7E6',
   gray_500: '#6E6D6C',
 
+  tertiary_600: '#247D74',
+  tertiary_500: '#319B8F',
+  tertiary_400: '#4AB7A8',
+
   secondary_300: '#8BEAB3',
 
   primary_300: '#A2BEEE',

From b17cd0ce048838e19810a71acef8efcba29dda67 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 18:56:08 -0400
Subject: [PATCH 224/291] CheckoutScreen to use updated CreateOrder type and
 remove unused paymentMethod import

---
 package-lock.json              |  8 +++----
 package.json                   |  2 +-
 src/hooks/useOrderSocket.ts    | 41 +++++++++++++---------------------
 src/screens/CheckoutScreen.tsx | 12 ++--------
 4 files changed, 22 insertions(+), 41 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 27968fb..3e64c7a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.18",
+        "@pharmatech/sdk": "^0.4.13",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -4026,9 +4026,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.18",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.18.tgz",
-      "integrity": "sha512-AfMYi7/6d/Iq7H3hk9UQNx3vmw+hDOn4R5VeVe9cnJnbxtWjoXXTizCIMRZHdMuRhsuEeJ2rd1odOcqOLzQ4Yg==",
+      "version": "0.4.13",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.13.tgz",
+      "integrity": "sha512-3r9KjyN2/zLadYS91k6aTitz0uC7QhG2D0LERS/rpAbw3axrVw5G4Jyj395IqPJaJYGmUKdWDv7+XMUH4pZmig==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 208c85a..db6d40c 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.18",
+    "@pharmatech/sdk": "^0.4.13",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 032f194..7caa803 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -1,5 +1,4 @@
-// src/hooks/useOrderSocket.ts
-import { useEffect, useRef, useCallback } from 'react';
+import { useEffect, useRef } from 'react';
 import io, { Socket } from 'socket.io-client';
 import * as SecureStore from 'expo-secure-store';
 import { SOCKET_URL } from '../lib/socketUrl';
@@ -23,26 +22,16 @@ export function useOrderSocket(
 ): Socket | null {
   const socketRef = useRef<Socket | null>(null);
 
-  // Memoize the handler to avoid re-subscribing on every render
-  const handleOrderUpdate = useCallback(
-    (updatedOrder: Order) => {
-      if (updatedOrder.id === orderId) {
-        console.log('[WS] Estado actualizado:', updatedOrder.status);
-        onOrderUpdate(updatedOrder);
-      }
-    },
-    [onOrderUpdate, orderId],
-  );
-
   useEffect(() => {
     if (!orderId) return;
     let isMounted = true;
 
-    (async () => {
+    const setupSocket = async () => {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!isMounted || !token) return;
 
       const authHeader = `Bearer ${token}`;
+
       const sock = io(SOCKET_URL, {
         transportOptions: {
           polling: {
@@ -66,23 +55,23 @@ export function useOrderSocket(
         console.log('[WS] evento recibido:', event, args),
       );
 
-      sock.on('order', handleOrderUpdate);
-    })();
+      sock.on('order', (orderUpdated: Order) => {
+        if (orderUpdated.id === orderId) {
+          console.log('[WS] Estado actualizado:', orderUpdated.status);
+          onOrderUpdate(orderUpdated);
+        }
+      });
+    };
+
+    setupSocket();
 
     return () => {
       isMounted = false;
-      const sock = socketRef.current;
-      if (sock) {
-        sock.off('connect');
-        sock.off('disconnect');
-        sock.off('connect_error');
-        sock.offAny();
-        sock.off('order', handleOrderUpdate);
-        sock.disconnect();
-      }
+      socketRef.current?.offAny();
+      socketRef.current?.disconnect();
       socketRef.current = null;
     };
-  }, [orderId, handleOrderUpdate]);
+  }, [orderId, onOrderUpdate]);
 
   return socketRef.current;
 }
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 15f97bd..f77862f 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -27,13 +27,7 @@ import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
 import { UserService } from '../services/user';
-import {
-  OrderType,
-  CreateOrder as SdkCreateOrder,
-  CreateOrderDetail,
-  PaymentMethod,
-} from '@pharmatech/sdk';
-
+import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
@@ -238,10 +232,8 @@ const CheckoutScreen = () => {
         console.log('Productos seleccionados para la orden:', products);
 
         // Construir el payload de la orden
-        const orderPayload: SdkCreateOrder = {
+        const orderPayload: CreateOrder = {
           type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
-          paymentMethod:
-            payment === 'efectivo' ? PaymentMethod.CASH : PaymentMethod.CARD,
           branchId: option === 'pickup' ? locationId || undefined : undefined,
           userAddressId:
             option === 'delivery' ? locationId || undefined : undefined,

From 3ada79b4dab149d8c01e4f491c4796bf15bc4754 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 17 May 2025 19:42:30 -0400
Subject: [PATCH 225/291] Refactor useOrderSocket to enhance order handling
 with initial order retrieval and status updates; update CheckoutScreen to
 store initial order status.

---
 src/hooks/useOrderSocket.ts    | 42 +++++++++++++++++++++++++++-------
 src/screens/CheckoutScreen.tsx | 14 +++---------
 2 files changed, 37 insertions(+), 19 deletions(-)

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
index 7caa803..a62caa5 100644
--- a/src/hooks/useOrderSocket.ts
+++ b/src/hooks/useOrderSocket.ts
@@ -18,7 +18,7 @@ export interface Order {
 
 export function useOrderSocket(
   orderId: string | null,
-  onOrderUpdate: (order: Order) => void,
+  onOrderUpdated: (order: Order) => void,
 ): Socket | null {
   const socketRef = useRef<Socket | null>(null);
 
@@ -42,25 +42,51 @@ export function useOrderSocket(
 
       socketRef.current = sock;
 
-      sock.on('connect', () => console.log('[WS] Conectado con ID:', sock.id));
+      sock.on('connect', () => {
+        console.log('[WS] Conectado con ID:', sock.id);
+        // Unirse al room de la orden
+        sock.emit('joinOrder', orderId);
+        // Solicitar el objeto completo de la orden
+        sock.emit('getOrder', orderId);
+      });
+
       sock.on('disconnect', (reason) =>
         console.log('[WS] Desconectado:', reason),
       );
+
       sock.on('connect_error', (err) =>
         console.log('[WS] Error en handshake:', err.message),
       );
 
-      // Debug: ver todos los eventos que llegan
+      // Depuración de todos los eventos entrantes
       sock.onAny((event, ...args) =>
         console.log('[WS] evento recibido:', event, args),
       );
 
-      sock.on('order', (orderUpdated: Order) => {
-        if (orderUpdated.id === orderId) {
-          console.log('[WS] Estado actualizado:', orderUpdated.status);
-          onOrderUpdate(orderUpdated);
+      // Evento inicial con el objeto completo de la orden
+      sock.on('order', (Order: Order) => {
+        if (Order.id === orderId) {
+          console.log('[WS] Orden inicial recibida:', Order);
+          onOrderUpdated(Order);
         }
       });
+
+      // Evento ligero para actualizaciones de status
+      sock.on(
+        'orderUpdated',
+        (orderUpdated: { orderId: string; status: OrderStatus }) => {
+          if (orderUpdated.orderId === orderId) {
+            console.log('[WS] Status actualizado:', orderUpdated.status);
+            onOrderUpdated({
+              id: orderUpdated.orderId,
+              status: orderUpdated.status,
+            });
+          }
+        },
+      );
+
+      // Iniciar la conexión una vez registrados todos los listeners
+      sock.connect();
     };
 
     setupSocket();
@@ -71,7 +97,7 @@ export function useOrderSocket(
       socketRef.current?.disconnect();
       socketRef.current = null;
     };
-  }, [orderId, onOrderUpdate]);
+  }, [orderId, onOrderUpdated]);
 
   return socketRef.current;
 }
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index f77862f..ec715e4 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -32,7 +32,7 @@ import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
 import { useFocusEffect } from '@react-navigation/native';
-import Popup from '../components/Popup'; // Import the Popup component
+import Popup from '../components/Popup';
 import EmailVerificationModal from './tab/EmailVerificationModal';
 import { RootState, AppDispatch } from '../redux/store';
 import {
@@ -259,17 +259,9 @@ const CheckoutScreen = () => {
           return;
         }
 
-        // Guardar el número de orden generado
+        // Guardar el número de orden generado y el status inicial
         setOrderNumber(orderResponse.id);
-
-        // Obtener el status real de la orden desde el backend
-        try {
-          const orderDetail = await OrderService.getById(orderResponse.id);
-          setOrderStatus(orderDetail.status); // <-- status real del backend
-        } catch (err) {
-          console.error('No se pudo obtener el status de la orden:', err);
-          setOrderStatus(orderResponse.status ?? null);
-        }
+        setOrderStatus(orderResponse.status);
 
         console.log('Orden creada exitosamente:', orderResponse);
 

From 99426529447b0a3c2f6fdd1b1428167da1be2d84 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 18 May 2025 00:12:08 -0400
Subject: [PATCH 226/291] updated websocket

---
 src/lib/socketUrl.ts                |  4 +--
 src/screens/ActiveOrdersScreen.tsx  |  6 ----
 src/screens/OrderTrackingScreen.tsx | 55 +++++++++++++++++------------
 3 files changed, 34 insertions(+), 31 deletions(-)

diff --git a/src/lib/socketUrl.ts b/src/lib/socketUrl.ts
index 65016c6..7788574 100644
--- a/src/lib/socketUrl.ts
+++ b/src/lib/socketUrl.ts
@@ -1,5 +1,5 @@
 const devModeFlag = process.env.PHARMATECH_DEV_MODE === 'true';
-const devUrl = 'ws://api-dev-8jfx.onrender.com';
-const prodUrl = 'ws://api-d8h5.onrender.com';
+const devUrl = 'https://api-dev-8jfx.onrender.com';
+const prodUrl = 'https://api-d8h5.onrender.com';
 
 export const SOCKET_URL = devModeFlag ? devUrl : prodUrl;
diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 51bd3eb..35f2918 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -4,7 +4,6 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useRouter } from 'expo-router';
 import Alert from '../components/Alerts';
-import Button from '../components/Button';
 import { OrderResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
@@ -152,11 +151,6 @@ const ActiveOrdersScreen = () => {
                       Ver detalles
                     </PoppinsText>
                   </TouchableOpacity>
-                  <Button
-                    title="Re ordenar"
-                    size="small"
-                    style={{ paddingVertical: 0 }}
-                  />
                 </View>
               </View>
             </View>
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index 47333a6..fbaa3e2 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -18,7 +18,7 @@ import {
   BuildingStorefrontIcon,
   MapPinIcon,
 } from 'react-native-heroicons/solid';
-import io from 'socket.io-client';
+import { io } from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
 
 const OrderTrackingScreen = () => {
@@ -31,7 +31,9 @@ const OrderTrackingScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
+
   const [isConnected, setIsConnected] = useState(false);
+  const [transport, setTransport] = useState('N/A');
 
   useEffect(() => {
     const fetchOrder = async () => {
@@ -51,39 +53,50 @@ const OrderTrackingScreen = () => {
     };
     fetchOrder();
 
-    const socket = io(SOCKET_URL, {
-      transportOptions: {
-        polling: {
-          extraHeaders: {
-            authorization: `Bearer ${SecureStore.getItemAsync('auth_token')}`,
-          },
-        },
-      },
-    });
-
     if (id) {
       fetchOrder();
-      if (socket.connected) {
-        onConnect();
-      }
+
+      const socket = io(SOCKET_URL, {
+        transportOptions: {
+          polling: {
+            extraHeaders: {
+              authorization: `Bearer ${SecureStore.getItemAsync('auth_token')}`,
+            },
+          },
+        },
+        transports: ['websocket'],
+        reconnection: true,
+        reconnectionAttempts: Infinity,
+        reconnectionDelay: 1000,
+        reconnectionDelayMax: 5000,
+      });
 
       function onConnect() {
         setIsConnected(true);
+        console.log('[WS] Conectado con ID:', socket.id);
         console.log('Connected to socket: ', isConnected);
-        socket.on('order', (order: OrderDetailedResponse) => {
-          handleDeliveryStatus(order);
+        setTransport(socket.io.engine.transport.name);
+
+        socket.on('order', (order) => {
+          console.log(order);
         });
       }
 
       function onDisconnect() {
         setIsConnected(false);
+        console.log(transport);
+        setTransport('N/A');
       }
 
+      socket.on('connect_error', (err) =>
+        console.log('[WS] Error en handshake:', err.message),
+      );
+
       socket.on('connect', onConnect);
       socket.on('disconnect', onDisconnect);
       return () => {
-        socket.off('connect', onConnect);
-        socket.off('disconnect', onDisconnect);
+        //socket.off('connect', onConnect);
+        //socket.off('disconnect', onDisconnect);
       };
     }
   }, []);
@@ -96,10 +109,6 @@ const OrderTrackingScreen = () => {
     );
   }
 
-  const handleDeliveryStatus = (e: OrderDetailedResponse) => {
-    console.log('Received message: ', e);
-  };
-
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -318,7 +327,7 @@ const OrderTrackingScreen = () => {
                         Teléfono de Contacto:
                       </PoppinsText>
                       <PoppinsText>
-                        +{order?.orderDeliveries[0].employee?.phoneNumber}
+                        {'+' + order?.orderDeliveries[0].employee?.phoneNumber}
                       </PoppinsText>
                     </View>
                   </View>

From c339ef14bfffd24626c732da79ac704588179487 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 18 May 2025 00:12:28 -0400
Subject: [PATCH 227/291] Adapting maps so they appear in APKs

---
 app.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app.json b/app.json
index d206435..44e6854 100644
--- a/app.json
+++ b/app.json
@@ -28,7 +28,7 @@
       "package": "com.pharmatech.pharmatech",
       "config": {
         "googleMaps": {
-          "apiKey": "process.env.GOOGLE_MAPS_API_KEY"
+          "apiKey": "AIzaSyAoesWK-4-JCtlF5TkHPLn3iInC8tiGNg4"
         }
       }
     },

From 3288191b309e57121f733a87564ac8b9a8abd832 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 18 May 2025 11:13:58 -0400
Subject: [PATCH 228/291] Untracking eas.json

---
 .gitignore |  1 -
 eas.json   | 38 --------------------------------------
 2 files changed, 39 deletions(-)
 delete mode 100644 eas.json

diff --git a/.gitignore b/.gitignore
index 71c3fbc..6996578 100644
--- a/.gitignore
+++ b/.gitignore
@@ -131,5 +131,4 @@ docs/pages/versions/*/react-native/*.diff
 # iOS
 **/ios/.xcode.env.local
 
-
 eas.json
\ No newline at end of file
diff --git a/eas.json b/eas.json
deleted file mode 100644
index 6ed69d9..0000000
--- a/eas.json
+++ /dev/null
@@ -1,38 +0,0 @@
-{
-  "build": {
-    "preview": {
-      "android": {
-        "buildType": "apk"
-      },
-      "env": {
-        "PHARMATECH_DEV_MODE": "true",
-        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
-        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
-        "CLOUDINARY_API_KEY": "281941874694529",
-        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
-      }
-    },
-    "development": {
-      "developmentClient": true,
-      "android": {
-        "buildType": "apk"
-      },
-      "env": {
-        "PHARMATECH_DEV_MODE": "true",
-        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
-        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
-        "CLOUDINARY_API_KEY": "281941874694529",
-        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
-      }
-    },
-    "production": {
-      "env": {
-        "PHARMATECH_DEV_MODE": "false",
-        "GOOGLE_MAPS_API_KEY": "AIzaSyCNSodLhsdKkK_7ZslqQpw9RzH3uhvWS_Q",
-        "NEXT_PUBLIC_CLOUDINARY_CLOUD_NAME": "pharmatech",
-        "CLOUDINARY_API_KEY": "281941874694529",
-        "CLOUDINARY_API_SECRET": "3vJYAPm15WGBCEnKAbCogGYdoM4"
-      }
-    }
-  }
-}

From 09cc86b46ccda9846d0814c4fb288198c760d98e Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 18 May 2025 15:23:10 -0400
Subject: [PATCH 229/291] Change to "Mi Perfil"

---
 src/screens/MenuScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
index a7bc1ab..8b18a07 100644
--- a/src/screens/MenuScreen.tsx
+++ b/src/screens/MenuScreen.tsx
@@ -28,7 +28,7 @@ export default function MenuScreen() {
   const items = [
     {
       id: '1',
-      title: 'Perfil',
+      title: 'Mi Perfil',
       icon: <UserIcon color={Colors.iconMainPrimary} />,
       onPress: () => router.push('/profile'),
     },

From 58f9a7d026535b6bdda0ac19017200b04111d56c Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 18 May 2025 17:37:11 -0400
Subject: [PATCH 230/291] Changes in directions fields and redirection

---
 src/screens/DirectionCreateScreen.tsx | 10 +++++-----
 src/screens/DirectionScreen.tsx       |  9 ++++++++-
 src/screens/SelectLocationScreen.tsx  |  6 ++++--
 3 files changed, 17 insertions(+), 8 deletions(-)

diff --git a/src/screens/DirectionCreateScreen.tsx b/src/screens/DirectionCreateScreen.tsx
index 35f3ca8..62485cd 100644
--- a/src/screens/DirectionCreateScreen.tsx
+++ b/src/screens/DirectionCreateScreen.tsx
@@ -151,7 +151,7 @@ const DirectionCreateScreen = () => {
           label="Estado"
           placeholder="Seleccione Estado"
           options={states.map((state) => state.name)}
-          borderColor={Colors.gray_100}
+          borderColor={selectedState ? Colors.gray_100 : Colors.semanticDanger}
           onSelect={(option) => {
             const sState = states.find((state) => state.name === option);
             if (sState) setSelectedState(sState.id);
@@ -161,21 +161,21 @@ const DirectionCreateScreen = () => {
           label="Ciudad"
           placeholder="Seleccione Ciudad"
           options={cities.map((city) => city.name)}
-          borderColor={Colors.gray_100}
+          borderColor={selectedCity ? Colors.gray_100 : Colors.semanticDanger}
           onSelect={(option) => {
             const sCity = cities.find((city) => city.name === option);
             if (sCity) setSelectedCity(sCity.id);
           }}
         />
         <Input
-          label="Dirección: (Ubicación actual)"
+          label="Dirección (Ubicación actual):"
           value={address?.adress}
           getValue={(value) => setAddress({ ...address, adress: value })}
           errorText="El campo no puede estar vacío"
           backgroundColor={Colors.textWhite}
         />
         <Input
-          label="Información adicional:"
+          label="Información adicional (opcional):"
           value={address?.additionalInformation ?? undefined}
           getValue={(value) =>
             setAddress({ ...address, additionalInformation: value })
@@ -183,7 +183,7 @@ const DirectionCreateScreen = () => {
           backgroundColor={Colors.textWhite}
         />
         <Input
-          label="Punto de referencia:"
+          label="Punto de referencia (opcional):"
           value={address?.referencePoint ?? undefined}
           getValue={(value) =>
             setAddress({ ...address, referencePoint: value })
diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index 8653b6b..983b8d2 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -164,7 +164,14 @@ const DirectionScreen = () => {
 
       <Button
         title="Agregar nueva dirección"
-        onPress={() => router.push('/selectLocation')}
+        onPress={() =>
+          router.push({
+            pathname: '/selectLocation',
+            params: {
+              fromCheckout: 'false', // Convertimos a cadena
+            },
+          })
+        }
       />
 
       {/* Popup de confirmación */}
diff --git a/src/screens/SelectLocationScreen.tsx b/src/screens/SelectLocationScreen.tsx
index a85b204..9930ef0 100644
--- a/src/screens/SelectLocationScreen.tsx
+++ b/src/screens/SelectLocationScreen.tsx
@@ -2,7 +2,7 @@ import React, { useState, useRef, useEffect } from 'react';
 import { StyleSheet, View, TextInput, Alert } from 'react-native';
 import MapView, { PROVIDER_GOOGLE, Region } from 'react-native-maps'; // Importa el tipo Region
 import * as Location from 'expo-location';
-import { useRouter } from 'expo-router';
+import { useLocalSearchParams, useRouter } from 'expo-router';
 import Button from '../components/Button';
 import { MapPinIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
@@ -12,6 +12,8 @@ import { Config } from '../config';
 const SelectLocationScreen = () => {
   console.log('Clave de API utilizada:', Config.googleMapsApiKey);
 
+  const { fromCheckout } = useLocalSearchParams();
+
   const [selectedLocation, setSelectedLocation] = useState<{
     latitude: number;
     longitude: number;
@@ -117,7 +119,7 @@ const SelectLocationScreen = () => {
         params: {
           latitude: selectedLocation.latitude.toString(),
           longitude: selectedLocation.longitude.toString(),
-          fromCheckout: 'true', // Convertimos a cadena
+          fromCheckout: fromCheckout === 'true' ? 'true' : 'false', // Convertimos a cadena
         },
       });
     } else {

From 2d1347e590939b948213a5573cbcfb820ef2a536 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 18 May 2025 18:37:06 -0400
Subject: [PATCH 231/291] Fixing some errors that appeared in delivery details

---
 src/components/DeliveryMap.tsx                |  96 +++++++++----
 src/screens/delivery/DeliveryDetailScreen.tsx | 135 +++++++++++-------
 2 files changed, 151 insertions(+), 80 deletions(-)

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index c987c23..fa3e7e4 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -1,8 +1,9 @@
 import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
-import { StyleSheet, View, Alert } from 'react-native';
+import { StyleSheet, View, Alert, ActivityIndicator } from 'react-native';
 import * as Location from 'expo-location';
 import { Config } from '../config';
+import { Colors } from '../styles/theme';
 
 interface DeliveryMapProps {
   deliveryState: number;
@@ -25,6 +26,7 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   const [customerRouteCoordinates, setCustomerRouteCoordinates] = useState<
     { latitude: number; longitude: number }[]
   >([]);
+  const [isLoading, setIsLoading] = useState(true); // Estado de carga
 
   // Solicitar permisos y obtener la ubicación del delivery
   useEffect(() => {
@@ -48,15 +50,6 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           latitude: location.coords.latitude,
           longitude: location.coords.longitude,
         });
-
-        // Obtener la ruta desde la ubicación del delivery hasta la sucursal
-        fetchRoute(
-          location.coords.latitude,
-          location.coords.longitude,
-          branchLocation.latitude,
-          branchLocation.longitude,
-          setRouteCoordinates,
-        );
       } catch (error) {
         console.error('Error al obtener la ubicación del delivery:', error);
         Alert.alert(
@@ -96,11 +89,30 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     }
   };
 
+  // Obtener la ruta hacia la sucursal
+  useEffect(() => {
+    if (
+      deliveryLocation &&
+      branchLocation.latitude !== 0 &&
+      branchLocation.longitude !== 0
+    ) {
+      fetchRoute(
+        deliveryLocation.latitude,
+        deliveryLocation.longitude,
+        branchLocation.latitude,
+        branchLocation.longitude,
+        setRouteCoordinates,
+      );
+    }
+  }, [deliveryLocation, branchLocation]);
+
   // Obtener la ruta hacia el cliente cuando el estado sea el correspondiente
   useEffect(() => {
     if (
-      deliveryState >= 3 && // Estado "Ir a destino de entrega" o posterior
-      deliveryLocation
+      deliveryState >= 3 &&
+      deliveryLocation &&
+      customerLocation.latitude !== 0 &&
+      customerLocation.longitude !== 0
     ) {
       fetchRoute(
         deliveryLocation.latitude,
@@ -113,7 +125,20 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
       // Limpiar la ruta hacia la sucursal
       setRouteCoordinates([]);
     }
-  }, [deliveryState, deliveryLocation]);
+  }, [deliveryState, deliveryLocation, customerLocation]);
+
+  // Verificar si todos los datos necesarios están disponibles
+  useEffect(() => {
+    if (
+      deliveryLocation &&
+      branchLocation.latitude !== 0 &&
+      branchLocation.longitude !== 0 &&
+      customerLocation.latitude !== 0 &&
+      customerLocation.longitude !== 0
+    ) {
+      setIsLoading(false); // Finalizar la carga cuando todos los datos estén disponibles
+    }
+  }, [deliveryLocation, branchLocation, customerLocation]);
 
   // Decodificar la polyline de Google Maps
   const decodePolyline = (encoded: string) => {
@@ -154,13 +179,22 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     return points;
   };
 
+  if (isLoading) {
+    // Mostrar un indicador de carga mientras se obtienen los datos
+    return (
+      <View style={styles.loadingContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
+
   return (
     <View style={styles.container}>
       <MapView
         style={styles.map}
         initialRegion={{
-          latitude: branchLocation.latitude,
-          longitude: branchLocation.longitude,
+          latitude: branchLocation.latitude || 0,
+          longitude: branchLocation.longitude || 0,
           latitudeDelta: 0.05,
           longitudeDelta: 0.05,
         }}
@@ -175,18 +209,23 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
         )}
 
         {/* Mostrar la ubicación de la sucursal */}
-        <Marker
-          coordinate={branchLocation}
-          title="Sucursal de origen"
-          pinColor="blue"
-        />
+        {branchLocation.latitude !== 0 && branchLocation.longitude !== 0 && (
+          <Marker
+            coordinate={branchLocation}
+            title="Sucursal de origen"
+            pinColor="blue"
+          />
+        )}
 
         {/* Mostrar la ubicación del cliente */}
-        <Marker
-          coordinate={customerLocation}
-          title="Ubicación del cliente"
-          pinColor="green"
-        />
+        {customerLocation.latitude !== 0 &&
+          customerLocation.longitude !== 0 && (
+            <Marker
+              coordinate={customerLocation}
+              title="Ubicación del cliente"
+              pinColor="green"
+            />
+          )}
 
         {/* Mostrar la ruta hacia la sucursal */}
         {routeCoordinates.length > 0 && (
@@ -197,7 +236,7 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           />
         )}
 
-        {/* Mostrar la ruta hacia el cliente solo si el estado es el correspondiente */}
+        {/* Mostrar la ruta hacia el cliente */}
         {deliveryState >= 3 && customerRouteCoordinates.length > 0 && (
           <Polyline
             coordinates={customerRouteCoordinates}
@@ -220,6 +259,11 @@ const styles = StyleSheet.create({
   map: {
     flex: 1,
   },
+  loadingContainer: {
+    height: 300,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
 });
 
 export default DeliveryMap;
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index 3af81bf..ac5d5f5 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -41,23 +41,91 @@ const DeliveryDetailScreen: React.FC = () => {
   const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
     undefined,
   );
+  const [isOrderDetailsLoading, setIsOrderDetailsLoading] = useState(true);
+  const [isFetchingOrder, setIsFetchingOrder] = useState(false); // Nuevo estado de carga para fetchOrder
+  const [branchNames, setBranchNames] = useState<
+    Record<string, { name: string; latitude: number; longitude: number }>
+  >({});
+  const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
+  const router = useRouter();
+
+  useEffect(() => {
+    const fetchOrderDetails = async () => {
+      try {
+        if (!orderDetails) {
+          const details = await DeliveryService.getOrderDetails(id as string);
+          dispatch(setOrderDetails({ id: id as string, details }));
+        }
+      } catch (error) {
+        console.error('Error al obtener los detalles del pedido:', error);
+      } finally {
+        setIsOrderDetailsLoading(false);
+      }
+    };
+
+    fetchOrderDetails();
+  }, [id, orderDetails, dispatch]);
+
+  useEffect(() => {
+    const fetchBranches = async () => {
+      try {
+        const branches = await BranchService.findAll({ page: 1, limit: 100 });
+        const branchMap = branches.results.reduce(
+          (
+            acc: Record<
+              string,
+              { name: string; latitude: number; longitude: number }
+            >,
+            branch,
+          ) => {
+            acc[branch.id] = {
+              name: branch.name,
+              latitude: branch.latitude,
+              longitude: branch.longitude,
+            };
+            return acc;
+          },
+          {},
+        );
+
+        setBranchNames(branchMap);
+      } catch (error) {
+        console.error('Error al obtener las sucursales:', error);
+      } finally {
+        setIsFetchingOrder(false);
+      }
+    };
+
+    if (orderDetails) {
+      fetchBranches();
+    }
+  }, [orderDetails]);
+
   useEffect(() => {
     const fetchOrder = async () => {
+      setIsFetchingOrder(true); // Iniciar el indicador de carga
+      let timerId: NodeJS.Timeout | null = null; // Identificador del temporizador
+
       try {
         if (!orderDetails) {
-          console.error(
-            'No se encontraron detalles de la orden de tipo delivery.',
-          );
+          // Agregar un temporizador de 2 segundos antes de mostrar el error
+          timerId = setTimeout(() => {
+            if (!orderDetails) {
+              console.error(
+                'No se encontraron detalles de la orden de tipo delivery.',
+              );
+            }
+          }, 2000);
           return;
         }
 
-        const orderId = orderDetails.orderId; // Extraer el ID de la orden
+        const orderId = orderDetails.orderId;
         console.log('ID de la orden:', orderId);
 
-        const order = await UserService.getOrder(orderId); // Usar el ID de la orden
+        const order = await UserService.getOrder(orderId);
 
         if (order.success) {
-          console.log('Datos del pedido:', order.data); // Log para verificar los datos
+          console.log('Datos del pedido:', order.data);
           setOrder(order.data);
         } else {
           console.error('Error al obtener el pedido:', order.error);
@@ -65,7 +133,10 @@ const DeliveryDetailScreen: React.FC = () => {
       } catch (error) {
         console.error('Error en fetchOrder:', error);
       } finally {
-        setLoading(false);
+        setIsFetchingOrder(false); // Finalizar el indicador de carga
+        if (timerId) {
+          clearTimeout(timerId); // Cancelar el temporizador si los datos están disponibles
+        }
       }
     };
 
@@ -76,13 +147,6 @@ const DeliveryDetailScreen: React.FC = () => {
     (state: RootState) => state.delivery.deliveryState[id as string] || 0,
   );
 
-  const [branchNames, setBranchNames] = useState<
-    Record<string, { name: string; latitude: number; longitude: number }>
-  >({});
-  const [loading, setLoading] = useState(true);
-  const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
-  const router = useRouter();
-
   // Estados para las alertas
   const [showAlert, setShowAlert] = useState(false);
   const [alertType, setAlertType] = useState<'success' | 'error' | 'info'>(
@@ -115,45 +179,6 @@ const DeliveryDetailScreen: React.FC = () => {
     longitude: orderDetails?.address?.longitude || 0,
   };
 
-  useEffect(() => {
-    const fetchOrderDetails = async () => {
-      if (!orderDetails) {
-        const details = await DeliveryService.getOrderDetails(id as string);
-        dispatch(setOrderDetails({ id: id as string, details }));
-      }
-
-      try {
-        // Obtener todas las sucursales y mapear sus nombres y coordenadas
-        const branches = await BranchService.findAll({ page: 1, limit: 100 });
-        const branchMap = branches.results.reduce(
-          (
-            acc: Record<
-              string,
-              { name: string; latitude: number; longitude: number }
-            >,
-            branch,
-          ) => {
-            acc[branch.id] = {
-              name: branch.name,
-              latitude: branch.latitude,
-              longitude: branch.longitude,
-            };
-            return acc;
-          },
-          {},
-        );
-
-        setBranchNames(branchMap);
-      } catch (error) {
-        console.error('Error al obtener los detalles del pedido:', error);
-      } finally {
-        setLoading(false);
-      }
-    };
-
-    fetchOrderDetails();
-  }, [id, orderDetails, dispatch]);
-
   const handleNextState = async () => {
     try {
       if (deliveryState === buttonStates.length - 1) {
@@ -242,11 +267,13 @@ const DeliveryDetailScreen: React.FC = () => {
     }
   };
 
-  if (loading) {
+  if (isOrderDetailsLoading || isFetchingOrder) {
+    // Mostrar un indicador de carga mientras se obtienen los detalles del pedido o la orden
     return <ActivityIndicator size="large" color={Colors.primary} />;
   }
 
   if (!orderDetails) {
+    // Mostrar un mensaje de error si no se encuentran los detalles del pedido
     return (
       <View style={styles.errorContainer}>
         <PoppinsText style={styles.errorText}>

From b1844159476efc16af9c64cc6580ef85d6c0b6ac Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 18 May 2025 18:51:32 -0400
Subject: [PATCH 232/291] Change alert in direction change

---
 src/screens/DirectionChangeScreen.tsx | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/screens/DirectionChangeScreen.tsx b/src/screens/DirectionChangeScreen.tsx
index 26ebc2b..261a9a6 100644
--- a/src/screens/DirectionChangeScreen.tsx
+++ b/src/screens/DirectionChangeScreen.tsx
@@ -59,7 +59,6 @@ const ChangeDirectionScreen = () => {
 
         if (address.success) {
           setAddress(address.data);
-
           const city = await StateService.getCity(address.data.cityId);
           if (city.success) {
             setSelectedCity(city.data?.name ?? '');
@@ -109,7 +108,8 @@ const ChangeDirectionScreen = () => {
       setLoading(false);
     } catch (error) {
       console.error('Error al actualizar la dirección:', error);
-      alert('Ocurrió un error al intentar actualizar la dirección');
+      setErrorMessage(String(error));
+      setShowErrorAlert(true);
     }
   };
 

From 8632ed578fae0c3bdc5528b6ca9b80763e8689ac Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 18 May 2025 20:15:41 -0400
Subject: [PATCH 233/291] Adapting proper estimated time to order delivery
 cards

---
 src/components/OrderCard.tsx                |  12 +-
 src/screens/delivery/DeliveryHomeScreen.tsx | 151 ++++++++++++++++----
 2 files changed, 129 insertions(+), 34 deletions(-)

diff --git a/src/components/OrderCard.tsx b/src/components/OrderCard.tsx
index ca4451b..67d196c 100644
--- a/src/components/OrderCard.tsx
+++ b/src/components/OrderCard.tsx
@@ -59,7 +59,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
       </PoppinsText>
 
       {/* Details */}
-      <View style={styles.details}>
+      <View>
         <View style={styles.detailRow}>
           <MapPinIcon size={20} color={Colors.primary} />
           <PoppinsText style={styles.detailText}>{address}</PoppinsText>
@@ -73,7 +73,7 @@ const OrderCard: React.FC<OrderCardProps> = ({
         <View style={styles.detailRow}>
           <ClockIcon size={20} color={Colors.primary} />
           <PoppinsText style={styles.detailText}>
-            Hora de entrega: {estimatedTime}
+            Tiempo estimado: {estimatedTime}
           </PoppinsText>
         </View>
       </View>
@@ -135,18 +135,18 @@ const styles = StyleSheet.create({
     color: Colors.primary,
     marginBottom: 8,
   },
-  details: {
-    marginBottom: 4,
-  },
   detailRow: {
     flexDirection: 'row',
     alignItems: 'center',
-    marginBottom: 8,
+    marginBottom: 10,
   },
   detailText: {
     fontSize: FontSizes.b3.size,
     color: Colors.textMain,
     marginLeft: 8,
+    flexWrap: 'wrap',
+    maxWidth: '90%',
+    textAlign: 'left',
   },
   button: {
     marginBottom: 8,
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index 43e9d0f..4136972 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -17,17 +17,63 @@ import { DeliveryService } from '../../services/delivery';
 import { BranchService } from '../../services/branches';
 import {
   OrderDeliveryDetailedResponse,
-  BranchResponse,
   OrderDeliveryStatus,
 } from '@pharmatech/sdk';
 import { useAlert } from '../../components/AlertProvider'; // Importar el hook useAlert
+import * as Location from 'expo-location'; // Importar Location para obtener la ubicación actual
+import { Config } from '../../config'; // Importar la configuración de la API de Google Maps
+
+// Definir el tipo para un leg de la API de Google Maps Directions
+interface GoogleMapsLeg {
+  duration: {
+    value: number; // Duración en segundos
+  };
+}
+
+const calculateTravelTime = async (
+  origin: { latitude: number; longitude: number },
+  destination: { latitude: number; longitude: number },
+): Promise<number> => {
+  try {
+    const response = await fetch(
+      `https://maps.googleapis.com/maps/api/directions/json?origin=${origin.latitude},${origin.longitude}&destination=${destination.latitude},${destination.longitude}&key=${Config.googleMapsApiKey}`,
+    );
+    const data = await response.json();
+
+    if (data.routes && data.routes.length > 0) {
+      // Extraer el tiempo estimado en segundos
+      const durationInSeconds = data.routes[0].legs.reduce(
+        (total: number, leg: GoogleMapsLeg) => total + leg.duration.value,
+        0,
+      );
+
+      // Convertir a minutos
+      return Math.ceil(durationInSeconds / 60);
+    } else {
+      console.error('No se pudo calcular el tiempo estimado.');
+      return 0;
+    }
+  } catch (error) {
+    console.error('Error al calcular el tiempo estimado:', error);
+    return 0;
+  }
+};
+
+// Extender el tipo OrderDeliveryDetailedResponse
+type ExtendedOrderDeliveryDetailedResponse = OrderDeliveryDetailedResponse & {
+  formattedEstimatedTime: string; // Nueva propiedad para el tiempo formateado
+};
 
 export default function DeliveryHomeScreen() {
   const router = useRouter();
   const { showAlert } = useAlert();
 
-  const [orders, setOrders] = useState<OrderDeliveryDetailedResponse[]>([]);
-  const [branchNames, setBranchNames] = useState<Record<string, string>>({});
+  const [orders, setOrders] = useState<ExtendedOrderDeliveryDetailedResponse[]>(
+    [],
+  );
+  const [branchNames, setBranchNames] = useState<
+    Record<string, { name: string; latitude: number; longitude: number }>
+  >({});
   const [loading, setLoading] = useState<boolean>(true);
   const [refreshing, setRefreshing] = useState<boolean>(false);
   const [selectedOrder, setSelectedOrder] =
@@ -44,30 +90,85 @@ export default function DeliveryHomeScreen() {
       const payload = JSON.parse(atob(jwt.split('.')[1]));
       const employeeId = payload.sub;
 
+      // Obtener las órdenes asignadas
       const response = await DeliveryService.getAssignedOrders(employeeId);
 
-      const detailedOrders = await Promise.all(
-        response.results.map(async (order) => {
-          const details = await DeliveryService.getOrderDetails(order.id);
-          return details;
-        }),
-      );
-
-      const branchIds = [
-        ...new Set(detailedOrders.map((order) => order.branchId)),
-      ];
+      // Obtener las sucursales
       const branches = await BranchService.findAll({ page: 1, limit: 100 });
       const branchMap = branches.results.reduce(
-        (acc: Record<string, string>, branch: BranchResponse) => {
-          if (branchIds.includes(branch.id)) {
-            acc[branch.id] = branch.name;
-          }
+        (
+          acc: Record<
+            string,
+            { name: string; latitude: number; longitude: number }
+          >,
+          branch,
+        ) => {
+          acc[branch.id] = {
+            name: branch.name,
+            latitude: branch.latitude,
+            longitude: branch.longitude,
+          };
           return acc;
         },
         {},
       );
-
       setBranchNames(branchMap);
+
+      // Procesar las órdenes con cálculo de tiempo estimado
+      const detailedOrders: ExtendedOrderDeliveryDetailedResponse[] =
+        await Promise.all(
+          response.results.map(async (order) => {
+            const details = await DeliveryService.getOrderDetails(order.id);
+
+            // Obtener la ubicación actual del repartidor
+            const location = await Location.getCurrentPositionAsync({});
+            const deliveryLocation = {
+              latitude: location.coords.latitude,
+              longitude: location.coords.longitude,
+            };
+
+            // Obtener la ubicación de la sucursal
+            const branchLocation = {
+              latitude: branchMap[details.branchId]?.latitude || 0,
+              longitude: branchMap[details.branchId]?.longitude || 0,
+            };
+
+            // Obtener la ubicación del cliente
+            const customerLocation = {
+              latitude: details.address.latitude,
+              longitude: details.address.longitude,
+            };
+
+            // Calcular tiempos de viaje
+            const timeToBranch = await calculateTravelTime(
+              deliveryLocation,
+              branchLocation,
+            );
+            const timeToCustomer = await calculateTravelTime(
+              branchLocation,
+              customerLocation,
+            );
+
+            // Tiempo total estimado en minutos
+            const totalEstimatedTime = timeToBranch + timeToCustomer;
+
+            // Formatear el tiempo estimado
+            const formattedEstimatedTime =
+              totalEstimatedTime < 60
+                ? `${totalEstimatedTime} minutos`
+                : `${Math.floor(totalEstimatedTime / 60)} horas ${
+                    totalEstimatedTime % 60
+                  } minutos`;
+
+            // Retornar la orden con el tiempo estimado formateado
+            return {
+              ...details,
+              estimatedTime: new Date(), // Mantener el tipo original como Date
+              formattedEstimatedTime, // Asignar el tiempo formateado
+            };
+          }),
+        );
+
       setOrders(detailedOrders);
     } catch (error) {
       console.error('Error al obtener las órdenes asignadas:', error);
@@ -127,14 +228,6 @@ export default function DeliveryHomeScreen() {
     setSelectedOrder(null);
   };
 
-  const formatTime = (isoDate: string | Date): string => {
-    const date = typeof isoDate === 'string' ? new Date(isoDate) : isoDate;
-    return date.toLocaleTimeString('es-VE', {
-      hour: '2-digit',
-      minute: '2-digit',
-    });
-  };
-
   const calculateElapsedTime = (createdAt: string): string => {
     const now = new Date();
     const createdDate = new Date(createdAt);
@@ -186,8 +279,10 @@ export default function DeliveryHomeScreen() {
               orderCode={order.orderId.split('-')[0]} // Mostrar solo los primeros 8 caracteres
               orderType="pedido"
               address={order.address?.adress || 'Dirección no disponible'}
-              branch={branchNames[order.branchId] || 'Sucursal no disponible'}
-              estimatedTime={formatTime(order.estimatedTime)} // Pasar directamente la cadena ISO
+              branch={
+                branchNames[order.branchId]?.name || 'Sucursal no disponible'
+              }
+              estimatedTime={order.formattedEstimatedTime} // Mostrar el tiempo estimado
               elapsedTime={calculateElapsedTime(order.createdAt)}
               deliveryStatus={
                 order.deliveryStatus as

From b99ed5e0be3a59376c266996777e1cdea3f067e9 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sun, 18 May 2025 20:18:23 -0400
Subject: [PATCH 234/291] Added category detail

---
 src/app/_layout.tsx                  |   4 +
 src/app/categoryDetail/[id].tsx      |   2 +
 src/app/categoryDetail/_layout.tsx   |  38 +++++
 src/screens/CategoryDetailScreen.tsx | 224 +++++++++++++++++++++++++++
 src/screens/tab/CategoriesScreen.tsx |   5 +-
 src/services/category.ts             |  14 ++
 6 files changed, 286 insertions(+), 1 deletion(-)
 create mode 100644 src/app/categoryDetail/[id].tsx
 create mode 100644 src/app/categoryDetail/_layout.tsx
 create mode 100644 src/screens/CategoryDetailScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index a9c0b94..82ff0d8 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -162,6 +162,10 @@ export default function RootLayout() {
             options={{ headerShown: false }}
           />
           <Stack.Screen name="branchDetail" options={{ headerShown: false }} />
+          <Stack.Screen
+            name="categoryDetail"
+            options={{ headerShown: false }}
+          />
           <Stack.Screen
             name="deliveryHistoryDetail"
             options={{ headerShown: false }}
diff --git a/src/app/categoryDetail/[id].tsx b/src/app/categoryDetail/[id].tsx
new file mode 100644
index 0000000..a220fef
--- /dev/null
+++ b/src/app/categoryDetail/[id].tsx
@@ -0,0 +1,2 @@
+import CategoryDetailScreen from '../../screens/CategoryDetailScreen';
+export default CategoryDetailScreen;
diff --git a/src/app/categoryDetail/_layout.tsx b/src/app/categoryDetail/_layout.tsx
new file mode 100644
index 0000000..cb44643
--- /dev/null
+++ b/src/app/categoryDetail/_layout.tsx
@@ -0,0 +1,38 @@
+import React from 'react';
+import { TouchableOpacity, View, StyleSheet } from 'react-native';
+import { Stack } from 'expo-router';
+import { ChevronLeftIcon } from 'react-native-heroicons/outline';
+
+export default function CategoryDetailLayout() {
+  return (
+    <Stack
+      screenOptions={({ navigation }) => ({
+        headerShown: true,
+        headerTransparent: true,
+        headerTitle: '',
+        headerLeft: () =>
+          navigation.canGoBack() ? (
+            <View style={styles.iconContainer}>
+              <TouchableOpacity
+                onPress={navigation.goBack}
+                style={{
+                  padding: 12, // Aumentado
+                  marginLeft: -12,
+                  flexDirection: 'row',
+                  alignItems: 'center',
+                }}
+              >
+                <ChevronLeftIcon width={28} height={28} color="#000" />
+              </TouchableOpacity>
+            </View>
+          ) : null,
+      })}
+    />
+  );
+}
+
+const styles = StyleSheet.create({
+  iconContainer: {
+    marginLeft: -8,
+  },
+});
diff --git a/src/screens/CategoryDetailScreen.tsx b/src/screens/CategoryDetailScreen.tsx
new file mode 100644
index 0000000..ca269bf
--- /dev/null
+++ b/src/screens/CategoryDetailScreen.tsx
@@ -0,0 +1,224 @@
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  FlatList,
+  TouchableOpacity,
+  Image,
+} from 'react-native';
+import { useRouter, useLocalSearchParams } from 'expo-router';
+import { ProductService } from '../services/products';
+import { CategoryResponse, ProductPresentation } from '@pharmatech/sdk';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { usePagination } from '../hooks/usePagination';
+import { CategoryService } from '../services/category';
+
+export default function CategoryDetailScreen() {
+  const { id } = useLocalSearchParams<{ id: string }>();
+  const [category, setCategory] = useState<CategoryResponse | null>(null);
+
+  const router = useRouter();
+
+  const {
+    data: products,
+    fetchData,
+    loading,
+    hasMore,
+  } = usePagination<ProductPresentation>(async (page) => {
+    const productResponse = await ProductService.getProducts(page, 10, {
+      categoryId: [id!],
+    });
+
+    if (!productResponse.success) {
+      return { data: [], next: null };
+    }
+
+    return {
+      data: productResponse.data.results,
+      next: productResponse.data.next,
+    };
+  });
+
+  useEffect(() => {
+    if (!id) {
+      console.error('El ID de la categoria no está definido.');
+      return;
+    }
+
+    const fetchCategoryDetails = async () => {
+      try {
+        const categoryData = await CategoryService.getById(id);
+        setCategory(categoryData);
+      } catch (error) {
+        console.error('Error fetching category details:', error);
+      }
+    };
+
+    fetchCategoryDetails();
+  }, [id]);
+
+  const renderProduct = ({ item }: { item: ProductPresentation }) => {
+    const { product, presentation, stock } = item;
+
+    return (
+      <TouchableOpacity
+        style={styles.productCard}
+        onPress={() =>
+          router.push(`/products/${product.id}/presentation/${presentation.id}`)
+        }
+      >
+        <Image
+          source={{
+            uri: product.images?.[0]?.url || 'https://via.placeholder.com/60',
+          }}
+          style={styles.productImage}
+        />
+        <View style={styles.productInfo}>
+          <PoppinsText style={styles.productName}>
+            {product.name || 'Nombre no disponible'} {presentation.name}{' '}
+            {presentation.quantity} {presentation.measurementUnit}
+          </PoppinsText>
+          <PoppinsText style={styles.productQuantity}>
+            Cantidad disponible: {stock || 0}
+          </PoppinsText>
+        </View>
+      </TouchableOpacity>
+    );
+  };
+
+  if (loading && products.length === 0) {
+    return (
+      <View style={styles.loadingContainer}>
+        <PoppinsText style={styles.loadingText}>Cargando...</PoppinsText>
+      </View>
+    );
+  }
+
+  return (
+    <View style={styles.container}>
+      {category ? (
+        <>
+          <PoppinsText style={styles.title}>{category.name}</PoppinsText>
+        </>
+      ) : (
+        <PoppinsText style={styles.loadingText}>
+          No se pudo cargar la información de la categoria.
+        </PoppinsText>
+      )}
+      <View style={styles.divider} />
+      <PoppinsText style={styles.titleAddress}>
+        Productos disponibles en {category?.name || 'la categoria'}
+      </PoppinsText>
+      <FlatList
+        data={products}
+        keyExtractor={(item) => item.id}
+        renderItem={renderProduct}
+        contentContainerStyle={styles.list}
+        onEndReached={hasMore ? fetchData : null}
+        onEndReachedThreshold={0.5}
+        ListEmptyComponent={
+          !loading ? (
+            <PoppinsText style={styles.emptyText}>
+              No hay productos disponibles.
+            </PoppinsText>
+          ) : null
+        }
+      />
+    </View>
+  );
+}
+
+const styles = StyleSheet.create({
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    padding: 16,
+    paddingTop: 52,
+  },
+  title: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+    marginBottom: 8,
+  },
+  titleAddress: {
+    fontSize: FontSizes.s2.size,
+    lineHeight: FontSizes.s2.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
+  },
+  address: {
+    fontSize: FontSizes.b3.size,
+    lineHeight: FontSizes.b3.lineHeight,
+    color: Colors.textLowContrast,
+    marginBottom: 12,
+  },
+  map: {
+    fontSize: FontSizes.b2.size,
+    lineHeight: FontSizes.b2.lineHeight,
+    color: Colors.primary,
+    marginBottom: 4,
+  },
+  mapButton: {
+    flexDirection: 'row',
+    marginBottom: 8,
+  },
+  divider: {
+    marginBottom: 8,
+    borderBottomWidth: 1,
+    borderBottomColor: Colors.stroke,
+  },
+  mapButtonText: {
+    color: Colors.textWhite,
+    textAlign: 'center',
+    fontSize: FontSizes.b1.size,
+  },
+  list: {
+    marginTop: 10,
+  },
+  productCard: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    backgroundColor: Colors.menuWhite,
+    borderRadius: 8,
+    padding: 10,
+    marginBottom: 10,
+    shadowColor: '#000',
+    shadowOpacity: 0.1,
+    shadowRadius: 4,
+    elevation: 2,
+  },
+  productImage: {
+    width: 60,
+    height: 60,
+    borderRadius: 8,
+    marginRight: 10,
+  },
+  productInfo: {
+    flex: 1,
+  },
+  productName: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.textMain,
+    marginBottom: 4,
+  },
+  productQuantity: {
+    fontSize: FontSizes.c1.size,
+    color: Colors.textLowContrast,
+  },
+  emptyText: {
+    textAlign: 'center',
+    color: Colors.textLowContrast,
+    marginTop: 20,
+  },
+  loadingContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  loadingText: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.textLowContrast,
+  },
+});
diff --git a/src/screens/tab/CategoriesScreen.tsx b/src/screens/tab/CategoriesScreen.tsx
index f446b72..ab692a7 100644
--- a/src/screens/tab/CategoriesScreen.tsx
+++ b/src/screens/tab/CategoriesScreen.tsx
@@ -14,6 +14,7 @@ import Alert from '../../components/Alerts';
 import { CategoryService } from '../../services/category';
 import { CategoryResponse } from '@pharmatech/sdk';
 import CategoryDefaultImg from '../../assets/images/defaults/category.png';
+import { router } from 'expo-router';
 
 export default function CategoriesScreen() {
   const [categories, setCategories] = useState<CategoryResponse[]>([]);
@@ -40,7 +41,9 @@ export default function CategoriesScreen() {
   const renderItem: ListRenderItem<CategoryResponse> = ({ item }) => (
     <TouchableOpacity
       style={styles.gridItem}
-      onPress={() => console.log('Category selected:', item)}
+      onPress={() => {
+        router.push(`/categoryDetail/${item.id}`);
+      }}
     >
       <Image source={CategoryDefaultImg} />
       <PoppinsText style={styles.categoryText}>{item.name}</PoppinsText>
diff --git a/src/services/category.ts b/src/services/category.ts
index b1fac12..5a96d78 100644
--- a/src/services/category.ts
+++ b/src/services/category.ts
@@ -22,4 +22,18 @@ export const CategoryService = {
       };
     }
   },
+
+  getById: async (id: string): Promise<CategoryResponse> => {
+    if (!id || typeof id !== 'string') {
+      throw new Error('El ID proporcionado no es válido.');
+    }
+
+    try {
+      const response = await api.category.getById(id);
+      return response;
+    } catch (error) {
+      console.error('Error en CategoryService.getById:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };

From 668276aad0d2958d3b468d0db791479e1dca6b3c Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 19:31:30 -0400
Subject: [PATCH 235/291] Add OfferCard component with props and styles

---
 src/components/OfferCardProps.tsx | 158 ++++++++++++++++++++++++++++++
 1 file changed, 158 insertions(+)
 create mode 100644 src/components/OfferCardProps.tsx

diff --git a/src/components/OfferCardProps.tsx b/src/components/OfferCardProps.tsx
new file mode 100644
index 0000000..2e1f831
--- /dev/null
+++ b/src/components/OfferCardProps.tsx
@@ -0,0 +1,158 @@
+// src/components/OfferCard.tsx
+
+import React from 'react';
+import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+import CardButton from './CardButton';
+import { truncateString } from '../utils/commons';
+import { useCart } from '../hooks/useCart';
+import { useRouter } from 'expo-router';
+
+export interface OfferCardProps {
+  id: string;
+  presentationId: string;
+  productId: string;
+  imageUrl: string;
+  name: string;
+  category: string;
+  originalPrice: number;
+  discount: number;
+  finalPrice: number;
+  getQuantity?: (qty: number) => void;
+}
+
+const OfferCard: React.FC<OfferCardProps> = ({
+  id,
+  presentationId,
+  productId,
+  imageUrl,
+  name,
+  category,
+  originalPrice,
+  discount,
+  finalPrice,
+  getQuantity,
+}) => {
+  const { getItemQuantity, updateCartQuantity } = useCart();
+  const router = useRouter();
+
+  return (
+    <TouchableOpacity
+      onPress={() =>
+        router.push(`/products/${productId}/presentation/${presentationId}`)
+      }
+    >
+      <View style={styles.card}>
+        <View style={styles.tagContainer}>
+          <PoppinsText style={styles.tag}>{category}</PoppinsText>
+        </View>
+
+        <View style={styles.imageContainer}>
+          <Image source={{ uri: imageUrl }} style={styles.image} />
+          <View style={styles.cardButtonContainer}>
+            <CardButton
+              getValue={(qty) => {
+                getQuantity?.(qty);
+                updateCartQuantity(id, qty);
+              }}
+              initialValue={getItemQuantity(id)}
+            />
+          </View>
+        </View>
+
+        <View style={styles.description}>
+          <PoppinsText style={styles.name}>
+            {truncateString(name, 25)}
+          </PoppinsText>
+
+          <View style={styles.priceContainer}>
+            <PoppinsText style={styles.originalPrice}>
+              ${originalPrice.toFixed(2)}
+            </PoppinsText>
+            <PoppinsText style={styles.discountBadge}>
+              {discount.toFixed(0)}%
+            </PoppinsText>
+          </View>
+          <PoppinsText style={styles.finalPrice}>
+            ${finalPrice.toFixed(2)}
+          </PoppinsText>
+        </View>
+      </View>
+    </TouchableOpacity>
+  );
+};
+
+const styles = StyleSheet.create({
+  card: {
+    margin: 10,
+    backgroundColor: Colors.menuWhite,
+    borderWidth: 1,
+    borderColor: Colors.gray_100,
+    borderRadius: 15,
+    padding: 10,
+    maxWidth: 140,
+    minWidth: 140,
+    minHeight: 340,
+  },
+  tagContainer: {
+    flexDirection: 'row-reverse',
+    marginBottom: 8,
+  },
+  tag: {
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 50,
+    paddingHorizontal: 9,
+    color: Colors.textWhite,
+    fontSize: FontSizes.c3.size,
+  },
+  imageContainer: {
+    position: 'relative',
+    alignItems: 'center',
+    marginBottom: 12,
+  },
+  image: {
+    width: 114,
+    height: 118,
+    borderRadius: 14,
+  },
+  cardButtonContainer: {
+    position: 'absolute',
+    bottom: -15,
+    right: 8,
+    zIndex: 2,
+  },
+  description: {
+    marginHorizontal: 2,
+  },
+  name: {
+    fontSize: FontSizes.s2.size,
+    marginBottom: 6,
+    minHeight: 50,
+  },
+  priceContainer: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    marginBottom: 4,
+  },
+  originalPrice: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.disableText,
+    textDecorationLine: 'line-through',
+    marginRight: 6,
+  },
+  discountBadge: {
+    fontSize: FontSizes.c1.size,
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 4,
+    paddingHorizontal: 4,
+    color: Colors.textWhite,
+  },
+  finalPrice: {
+    fontSize: FontSizes.s1.size,
+    fontWeight: 'bold',
+    color: Colors.gray_500,
+  },
+});
+
+export default OfferCard;

From 67db2f2544825f9b2f7fa7c1d8169b4bbfa065a7 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 20:18:38 -0400
Subject: [PATCH 236/291] Refactor OfferCard component and enhance OffersScreen
 with loading state and promo filtering

---
 src/components/OfferCardProps.tsx |  75 ++++++++++++---------
 src/screens/tab/OffersScreen.tsx  | 105 ++++++++++++++++++++++++++++--
 2 files changed, 145 insertions(+), 35 deletions(-)

diff --git a/src/components/OfferCardProps.tsx b/src/components/OfferCardProps.tsx
index 2e1f831..8d5d0f5 100644
--- a/src/components/OfferCardProps.tsx
+++ b/src/components/OfferCardProps.tsx
@@ -44,28 +44,27 @@ const OfferCard: React.FC<OfferCardProps> = ({
       }
     >
       <View style={styles.card}>
-        <View style={styles.tagContainer}>
-          <PoppinsText style={styles.tag}>{category}</PoppinsText>
-        </View>
-
-        <View style={styles.imageContainer}>
-          <Image source={{ uri: imageUrl }} style={styles.image} />
-          <View style={styles.cardButtonContainer}>
-            <CardButton
-              getValue={(qty) => {
-                getQuantity?.(qty);
-                updateCartQuantity(id, qty);
-              }}
-              initialValue={getItemQuantity(id)}
-            />
+        <View style={styles.imageTagWrapper}>
+          <View style={styles.tagRow}>
+            <PoppinsText style={styles.tag}>{category}</PoppinsText>
+          </View>
+          <View style={styles.imageContainer}>
+            <Image source={{ uri: imageUrl }} style={styles.image} />
+            <View style={styles.cardButtonContainer}>
+              <CardButton
+                getValue={(qty) => {
+                  getQuantity?.(qty);
+                  updateCartQuantity(id, qty);
+                }}
+                initialValue={getItemQuantity(id)}
+              />
+            </View>
           </View>
         </View>
-
         <View style={styles.description}>
           <PoppinsText style={styles.name}>
             {truncateString(name, 25)}
           </PoppinsText>
-
           <View style={styles.priceContainer}>
             <PoppinsText style={styles.originalPrice}>
               ${originalPrice.toFixed(2)}
@@ -91,13 +90,21 @@ const styles = StyleSheet.create({
     borderColor: Colors.gray_100,
     borderRadius: 15,
     padding: 10,
+    paddingBottom: 5,
+    marginBottom: 16,
     maxWidth: 140,
     minWidth: 140,
-    minHeight: 340,
+    minHeight: 315,
+    maxHeight: 315,
   },
-  tagContainer: {
+  imageTagWrapper: {
+    width: '100%',
+    height: 135,
+    marginBottom: 30,
+  },
+  tagRow: {
+    width: '100%',
     flexDirection: 'row-reverse',
-    marginBottom: 8,
   },
   tag: {
     backgroundColor: Colors.semanticInfo,
@@ -105,11 +112,14 @@ const styles = StyleSheet.create({
     paddingHorizontal: 9,
     color: Colors.textWhite,
     fontSize: FontSizes.c3.size,
+    maxWidth: '100%',
   },
   imageContainer: {
-    position: 'relative',
-    alignItems: 'center',
-    marginBottom: 12,
+    minHeight: 118,
+    maxHeight: 118,
+    maxWidth: 114,
+    borderRadius: 15,
+    marginVertical: 8,
   },
   image: {
     width: 114,
@@ -117,29 +127,32 @@ const styles = StyleSheet.create({
     borderRadius: 14,
   },
   cardButtonContainer: {
-    position: 'absolute',
-    bottom: -15,
-    right: 8,
-    zIndex: 2,
+    position: 'relative',
+    top: -30,
+    left: 58,
+    maxWidth: '65%',
+    alignItems: 'flex-end',
+    zIndex: 999,
   },
   description: {
     marginHorizontal: 2,
+    justifyContent: 'center',
   },
   name: {
     fontSize: FontSizes.s2.size,
     marginBottom: 6,
-    minHeight: 50,
+    minHeight: 70,
+    maxHeight: 70,
   },
   priceContainer: {
     flexDirection: 'row',
     alignItems: 'center',
-    marginBottom: 4,
   },
   originalPrice: {
     fontSize: FontSizes.b1.size,
     color: Colors.disableText,
     textDecorationLine: 'line-through',
-    marginRight: 6,
+    marginRight: 14,
   },
   discountBadge: {
     fontSize: FontSizes.c1.size,
@@ -150,8 +163,8 @@ const styles = StyleSheet.create({
   },
   finalPrice: {
     fontSize: FontSizes.s1.size,
-    fontWeight: 'bold',
-    color: Colors.gray_500,
+    fontWeight: 'medium',
+    color: Colors.textMain,
   },
 });
 
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 9ca0574..0be6b3c 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -1,18 +1,115 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
+// src/screens/tab/OffersScreen.tsx
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  FlatList,
+  StyleSheet,
+  ActivityIndicator,
+  ListRenderItemInfo,
+} from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
+import { Colors, FontSizes } from '../../styles/theme';
+import OfferCard from '../../components/OfferCardProps';
+import { ProductService } from '../../services/products';
+import { ProductPresentation } from '../../types/api.d';
 
 export default function OffersScreen() {
+  const [offers, setOffers] = useState<ProductPresentation[]>([]);
+  const [loading, setLoading] = useState(false);
+
+  const loadOffers = async () => {
+    setLoading(true);
+    const res = await ProductService.getProducts(1, 50);
+    if (res.success) {
+      const promoItems = res.data.results.filter((item) =>
+        // puede venir en item.promo o dentro de item.presentation.promo
+        Boolean(
+          // @ts-expect-error - promo puede estar en item o en item.presentation
+          item.promo?.discount ??
+            // @ts-expect-error - promo puede estar en item o en item.presentation
+            item.presentation.promo?.discount,
+        ),
+      );
+      setOffers(promoItems);
+    } else {
+      console.error('Error al cargar productos:', res.error);
+    }
+    setLoading(false);
+  };
+
+  useEffect(() => {
+    loadOffers();
+  }, []);
+
+  if (loading) {
+    return (
+      <View style={styles.loaderContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
+
+  const renderOffer = ({ item }: ListRenderItemInfo<ProductPresentation>) => {
+    // @ts-expect-error: asumimos que existe promo en alguna de estas rutas
+    const promo = item.promo ?? item.presentation.promo;
+    const discount = promo?.discount ?? 0;
+    const finalPrice = item.price * (1 - discount / 100);
+
+    return (
+      <OfferCard
+        id={item.id}
+        presentationId={item.id}
+        productId={item.product.id}
+        imageUrl={item.product.images[0]?.url}
+        name={item.product.genericName ?? item.product.name}
+        category={item.product.categories?.[0]?.name ?? ''}
+        originalPrice={item.price}
+        discount={discount}
+        finalPrice={finalPrice}
+        getQuantity={() => {}}
+      />
+    );
+  };
+
   return (
     <View style={styles.container}>
-      <PoppinsText>Pantalla Ofertas</PoppinsText>
+      <PoppinsText weight="medium" style={styles.title}>
+        Ofertas especiales
+      </PoppinsText>
+      <FlatList
+        data={offers}
+        keyExtractor={(item) => item.id}
+        numColumns={2}
+        contentContainerStyle={styles.list}
+        renderItem={renderOffer}
+        columnWrapperStyle={styles.columnWrapper}
+        onRefresh={loadOffers}
+        refreshing={loading}
+      />
     </View>
   );
 }
 
 const styles = StyleSheet.create({
   container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    paddingLeft: 5,
+  },
+  title: {
+    fontSize: FontSizes.s1.size,
+    color: Colors.textMain,
+    paddingHorizontal: 15,
+  },
+  list: {
+    paddingHorizontal: 10,
+    paddingBottom: 20,
+  },
+  columnWrapper: {
+    justifyContent: 'space-between',
+    paddingHorizontal: 10,
+  },
+  loaderContainer: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',

From 3ee7a6e918541599e3bed26ec6a16713657adf40 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 20:55:07 -0400
Subject: [PATCH 237/291] Refactor NotificationsScreen to improve notification
 handling and UI updates

---
 src/screens/NotificationsScreen.tsx | 263 +++++++++++-----------------
 1 file changed, 106 insertions(+), 157 deletions(-)

diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 382b5f6..009bd7f 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -9,7 +9,7 @@ import {
   ImageSourcePropType,
   TouchableOpacity,
 } from 'react-native';
-import { useNavigation } from '@react-navigation/native';
+import { useNavigation, useFocusEffect } from '@react-navigation/native';
 import {
   formatDistanceToNow,
   parseISO,
@@ -21,8 +21,6 @@ import { ChevronLeftIcon } from 'react-native-heroicons/solid';
 import TopBar from '../components/TopBar';
 import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
-// Importamos y casteamos explicitamente el ícono por defecto
-import NotificationIconAsset from '../assets/images/favicon.png';
 import { Colors, FontSizes } from '../styles/theme';
 import { NotificationService } from '../services/notifications';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
@@ -33,43 +31,39 @@ import approvedImg from '../assets/images/notifications/image.jpg';
 import canceledImg from '../assets/images/notifications/w.jpg';
 import readyForPickupImg from '../assets/images/notifications/e.jpg';
 import deliveryImg from '../assets/images/notifications/m.jpg';
+import defaultIcon from '../assets/images/favicon.png';
 
-// Mapeo de iconos por estado
-const notificationIcons: Record<string, ImageSourcePropType> = {
-  completed: completedImg as unknown as ImageSourcePropType,
-  in_progress: inProgressImg as unknown as ImageSourcePropType,
-  approved: approvedImg as unknown as ImageSourcePropType,
-  canceled: canceledImg as unknown as ImageSourcePropType,
-  ready_for_pickup: readyForPickupImg as unknown as ImageSourcePropType,
-  delivery: deliveryImg as unknown as ImageSourcePropType,
+type NotificationItem = {
+  id: string;
+  title: string;
+  message: string;
+  createdAt: string;
+  isRead: boolean;
+  orderId: string;
+  status: string;
 };
 
-// Ícono por defecto, casteado a ImageSourcePropType
-const NotificationIcon =
-  NotificationIconAsset as unknown as ImageSourcePropType;
-
-// Función auxiliar para extraer orderId del mensaje
-const extractOrderIdFromMessage = (message: string): string | null => {
-  const match = message.match(/The order (\S+) has been updated to/i);
-  return match ? match[1] : null;
+const notificationIcons: Record<string, ImageSourcePropType> = {
+  completed: completedImg as ImageSourcePropType,
+  in_progress: inProgressImg as ImageSourcePropType,
+  approved: approvedImg as ImageSourcePropType,
+  canceled: canceledImg as ImageSourcePropType,
+  ready_for_pickup: readyForPickupImg as ImageSourcePropType,
+  delivery: deliveryImg as ImageSourcePropType,
 };
 
+const defaultIconSource = defaultIcon as ImageSourcePropType;
+
 export default function NotificationsScreen() {
   const navigation = useNavigation();
   const [notificationsList, setNotificationsList] = useState<
-    Array<{
-      id: string;
-      title: string;
-      message: string;
-      createdAt: string;
-      isRead: boolean;
-      orderId: string;
-    }>
+    NotificationItem[]
   >([]);
   const [loading, setLoading] = useState(true);
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
 
+  // Carga inicial de notificaciones
   useEffect(() => {
     const fetchNotifications = async () => {
       setLoading(true);
@@ -79,33 +73,28 @@ export default function NotificationsScreen() {
         if (!token) throw new Error('No se pudo obtener el token de usuario.');
 
         const res = await NotificationService.getNotifications();
-        if (res.success && Array.isArray(res.data)) {
-          console.log('Raw notifications payload:', res.data);
+        if (!res.success || !Array.isArray(res.data)) {
+          const errorMsg =
+            !res.success && 'error' in res && res.error
+              ? res.error
+              : 'Respuesta inesperada del servidor';
+          throw new Error(errorMsg);
+        }
 
-          setNotificationsList(
-            res.data.map((nt) => {
-              const rawOrderId =
-                nt.orderId ||
-                (nt as { order_id?: string }).order_id || // Specify type for `order_id`
-                (nt.data &&
-                  ((nt.data as { orderId?: string }).orderId || // Specify type for `data.orderId`
-                    (nt.data as { order_id?: string }).order_id)) || // Specify type for `data.order_id`
-                extractOrderIdFromMessage(nt.message) ||
-                '';
+        const items = res.data.map((nt: Record<string, unknown>) => {
+          const order = (nt.order || {}) as Record<string, unknown>;
+          return {
+            id: nt.id as string,
+            title: nt.title as string,
+            message: (nt.message as string).trim(),
+            createdAt: nt.createdAt as string,
+            isRead: !!nt.isRead,
+            orderId: order.id as string,
+            status: order.status as string,
+          };
+        });
 
-              return {
-                id: nt.id,
-                title: nt.title,
-                message: nt.message,
-                createdAt: nt.createdAt,
-                isRead: !!nt.isRead,
-                orderId: rawOrderId,
-              };
-            }),
-          );
-        } else if (!res.success) {
-          throw new Error(res.error || 'Respuesta inesperada del servidor');
-        }
+        setNotificationsList(items);
       } catch (err: unknown) {
         setErrorMessage(
           err instanceof Error ? err.message : 'Error desconocido',
@@ -115,37 +104,42 @@ export default function NotificationsScreen() {
         setLoading(false);
       }
     };
+
     fetchNotifications();
   }, []);
 
-  const handlePressNotification = useCallback(
-    async (nt: (typeof notificationsList)[0]) => {
-      console.log(`order ID: ${nt.orderId}`, nt);
+  // Marca todas como leídas al enfocar o desenfocar la pantalla
+  useFocusEffect(
+    useCallback(() => {
+      const markAllRead = async () => {
+        try {
+          const token = await getUserIdFromSecureStore();
+          if (!token) return;
 
-      if (nt.isRead) return;
+          // Filtrar solo las no leídas
+          const toMark = notificationsList.filter((n) => !n.isRead);
+          if (toMark.length === 0) return;
 
-      try {
-        const token = await getUserIdFromSecureStore();
-        if (!token) throw new Error('No se pudo obtener el token de usuario.');
-        if (nt.orderId) {
-          await NotificationService.markAsRead(nt.orderId, token);
+          // Llamar al servicio en paralelo
+          await Promise.all(
+            toMark.map((n) => NotificationService.markAsRead(n.orderId, token)),
+          );
+
+          // Actualizar estado local
           setNotificationsList((prev) =>
-            prev.map((n) => (n.id === nt.id ? { ...n, isRead: true } : n)),
+            prev.map((n) => ({ ...n, isRead: true })),
+          );
+        } catch (e) {
+          console.warn(
+            'Error al marcar todas las notificaciones como leídas:',
+            e,
           );
-        } else {
-          throw new Error('ID de notificación no válido.');
         }
-      } catch (err) {
-        const msg =
-          err instanceof Error
-            ? err.message
-            : 'Error desconocido al marcar la notificación como leída.';
-        console.error(`Error marcando notificación ${nt.id}:`, msg);
-        setErrorMessage(msg);
-        setShowErrorAlert(true);
-      }
-    },
-    [],
+      };
+
+      markAllRead();
+      // no necesitamos cleanup
+    }, [notificationsList]),
   );
 
   const formatRelativeDate = (dateString: string) => {
@@ -160,48 +154,8 @@ export default function NotificationsScreen() {
     return format(date, 'yyyy-MM-dd', { locale: es });
   };
 
-  const extractStatusKey = (message: string): string | null => {
-    const match = message.match(
-      /The order \S+ has been updated to ([\w_]+)\.?/i,
-    );
-    return match ? match[1].toLowerCase() : null;
-  };
-
-  const translateMessage = (message: string) => {
-    const match = message.match(
-      /The order (\S+) has been updated to ([\w_]+)\.?/i,
-    );
-    if (!match) return message;
-    const [, orderId, rawStatus] = match;
-    const key = rawStatus.replace(/_/g, ' ').toLowerCase();
-    const map: Record<string, string> = {
-      completed: 'completada',
-      'in progress': 'en progreso',
-      approved: 'aprobada',
-      canceled: 'cancelada',
-      'ready for pickup': 'lista para recoger',
-      delivery: 'en entrega',
-    };
-    return `La orden ${orderId} ha sido actualizada a ${map[key] || key}`;
-  };
-
-  const getTranslatedTitle = (nt: { title: string; message: string }) => {
-    const key = extractStatusKey(nt.message);
-    if (!key) return nt.title;
-    const map: Record<string, string> = {
-      completed: 'Pedido Completado',
-      in_progress: 'Pedido en Progreso',
-      approved: 'Orden Aprobada',
-      canceled: 'Orden Cancelada',
-      ready_for_pickup: 'Pedido Listo para Recoger',
-      delivery: 'Pedido en Entrega',
-    };
-    return map[key] || nt.title;
-  };
-
-  const getNotificationIcon = (message: string): ImageSourcePropType => {
-    const key = extractStatusKey(message);
-    return (key && notificationIcons[key]) || NotificationIcon;
+  const getNotificationIcon = (status: string): ImageSourcePropType => {
+    return notificationIcons[status] || defaultIconSource;
   };
 
   return (
@@ -209,27 +163,15 @@ export default function NotificationsScreen() {
       <TopBar />
       <TouchableOpacity
         onPress={() => navigation.goBack()}
-        style={{
-          paddingHorizontal: 10,
-          marginBottom: -4,
-          flexDirection: 'row',
-          alignSelf: 'flex-start',
-        }}
+        style={styles.backButton}
       >
         <ChevronLeftIcon
           width={20}
           height={20}
           color={Colors.primary}
-          style={{ marginRight: 2, marginLeft: 6 }}
+          style={{ marginRight: 4 }}
         />
-        <PoppinsText
-          weight="medium"
-          style={{
-            fontSize: FontSizes.b1.size,
-            lineHeight: FontSizes.b1.lineHeight,
-            color: Colors.primary,
-          }}
-        >
+        <PoppinsText weight="medium" style={styles.backText}>
           Volver
         </PoppinsText>
       </TouchableOpacity>
@@ -263,33 +205,24 @@ export default function NotificationsScreen() {
       ) : (
         <ScrollView contentContainerStyle={styles.listContainer}>
           {notificationsList.map((nt) => (
-            <TouchableOpacity
+            <View
               key={nt.id}
-              onPress={() => handlePressNotification(nt)}
-              activeOpacity={0.7}
+              style={[styles.item, !nt.isRead && styles.unreadBackground]}
             >
-              <View
-                style={[styles.item, !nt.isRead && styles.unreadBackground]}
-              >
-                <Image
-                  source={getNotificationIcon(nt.message)}
-                  style={styles.icon}
-                />
-                <View style={styles.textContainer}>
-                  <View style={styles.itemHeader}>
-                    <PoppinsText weight="semibold">
-                      {getTranslatedTitle(nt)}
-                    </PoppinsText>
-                    <PoppinsText style={styles.date}>
-                      {formatRelativeDate(nt.createdAt)}
-                    </PoppinsText>
-                  </View>
-                  <PoppinsText style={styles.message}>
-                    {translateMessage(nt.message)}
+              <Image
+                source={getNotificationIcon(nt.status)}
+                style={styles.icon}
+              />
+              <View style={styles.textContainer}>
+                <View style={styles.itemHeader}>
+                  <PoppinsText weight="semibold">{nt.title}</PoppinsText>
+                  <PoppinsText style={styles.date}>
+                    {formatRelativeDate(nt.createdAt)}
                   </PoppinsText>
                 </View>
+                <PoppinsText style={styles.message}>{nt.message}</PoppinsText>
               </View>
-            </TouchableOpacity>
+            </View>
           ))}
         </ScrollView>
       )}
@@ -302,6 +235,18 @@ const styles = StyleSheet.create({
     flex: 1,
     backgroundColor: Colors.bgColor,
   },
+  backButton: {
+    flexDirection: 'row',
+    alignItems: 'center',
+    paddingHorizontal: 10,
+    marginTop: 8,
+    marginBottom: -4,
+  },
+  backText: {
+    fontSize: FontSizes.b1.size,
+    lineHeight: FontSizes.b1.lineHeight,
+    color: Colors.primary,
+  },
   alertContainer: {
     position: 'absolute',
     top: 20,
@@ -313,19 +258,23 @@ const styles = StyleSheet.create({
   header: {
     flexDirection: 'row',
     paddingTop: 16,
+    paddingHorizontal: 20,
   },
   title: {
     fontSize: FontSizes.s1.size,
     color: Colors.primary,
-    marginLeft: 20,
   },
-  loader: { marginTop: 40 },
+  loader: {
+    marginTop: 40,
+  },
   emptyContainer: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
   },
-  listContainer: { paddingVertical: 10 },
+  listContainer: {
+    paddingVertical: 10,
+  },
   item: {
     flexDirection: 'row',
     alignItems: 'flex-start',

From bb94a484d497ffed9d8514e3e71d8ff3f21aa7dc Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 21:43:21 -0400
Subject: [PATCH 238/291] Refactor NotificationsScreen to use SVG icons instead
 of images; improve notification rendering and cleanup code

---
 src/assets/images/notifications/e.jpg     | Bin 3343 -> 0 bytes
 src/assets/images/notifications/e.svg     |   9 ++
 src/assets/images/notifications/f.jpg     | Bin 3280 -> 0 bytes
 src/assets/images/notifications/f.svg     |   9 ++
 src/assets/images/notifications/image.jpg | Bin 3426 -> 0 bytes
 src/assets/images/notifications/image.svg |   9 ++
 src/assets/images/notifications/m.jpg     | Bin 3975 -> 0 bytes
 src/assets/images/notifications/m.svg     |   9 ++
 src/assets/images/notifications/r.jpg     | Bin 2772 -> 0 bytes
 src/assets/images/notifications/r.svg     |   9 ++
 src/assets/images/notifications/w.jpg     | Bin 3916 -> 0 bytes
 src/assets/images/notifications/w.svg     |   9 ++
 src/screens/NotificationsScreen.tsx       | 119 +++++++++++-----------
 13 files changed, 111 insertions(+), 62 deletions(-)
 delete mode 100644 src/assets/images/notifications/e.jpg
 create mode 100644 src/assets/images/notifications/e.svg
 delete mode 100644 src/assets/images/notifications/f.jpg
 create mode 100644 src/assets/images/notifications/f.svg
 delete mode 100644 src/assets/images/notifications/image.jpg
 create mode 100644 src/assets/images/notifications/image.svg
 delete mode 100644 src/assets/images/notifications/m.jpg
 create mode 100644 src/assets/images/notifications/m.svg
 delete mode 100644 src/assets/images/notifications/r.jpg
 create mode 100644 src/assets/images/notifications/r.svg
 delete mode 100644 src/assets/images/notifications/w.jpg
 create mode 100644 src/assets/images/notifications/w.svg

diff --git a/src/assets/images/notifications/e.jpg b/src/assets/images/notifications/e.jpg
deleted file mode 100644
index 5627eb74a65577eca8fb3dc254a251328920e9d0..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3343
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
PF?J?;$zz|-2xtBY3pPOv

diff --git a/src/assets/images/notifications/e.svg b/src/assets/images/notifications/e.svg
new file mode 100644
index 0000000..56e4734
--- /dev/null
+++ b/src/assets/images/notifications/e.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="url(#pattern0_3402_19259)"/>
+<defs>
+<pattern id="pattern0_3402_19259" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3402_19259" transform="scale(0.00195312)"/>
+</pattern>
+<image id="image0_3402_19259" width="512" height="512" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/src/assets/images/notifications/f.jpg b/src/assets/images/notifications/f.jpg
deleted file mode 100644
index a6d4bdda93ea3cb6271869064fa055fc6c0ef7af..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3280
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
L+EiIR<4yb%8*nY2

diff --git a/src/assets/images/notifications/f.svg b/src/assets/images/notifications/f.svg
new file mode 100644
index 0000000..aa3a765
--- /dev/null
+++ b/src/assets/images/notifications/f.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="url(#pattern0_3402_19277)"/>
+<defs>
+<pattern id="pattern0_3402_19277" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3402_19277" transform="scale(0.00195312)"/>
+</pattern>
+<image id="image0_3402_19277" width="512" height="512" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/src/assets/images/notifications/image.jpg b/src/assets/images/notifications/image.jpg
deleted file mode 100644
index 1c86b1c61bb0e20d9af4720474579c5c79690790..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3426
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

diff --git a/src/assets/images/notifications/image.svg b/src/assets/images/notifications/image.svg
new file mode 100644
index 0000000..2b74403
--- /dev/null
+++ b/src/assets/images/notifications/image.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="url(#pattern0_3402_19250)"/>
+<defs>
+<pattern id="pattern0_3402_19250" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3402_19250" transform="scale(0.00195312)"/>
+</pattern>
+<image id="image0_3402_19250" width="512" height="512" preserveAspectRatio="none" xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAgAAAAIACAMAAADDpiTIAAAAA3NCSVQICAjb4U/gAAAACXBIWXMAABjGAAAYxgH2cLukAAAAGXRFWHRTb2Z0d2FyZQB3d3cuaW5rc2NhcGUub3Jnm+48GgAAAwBQTFRF////PbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOePbOer/UYNAAAAP90Uk5TAAECAwQF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"/>
+</defs>
+</svg>
diff --git a/src/assets/images/notifications/m.jpg b/src/assets/images/notifications/m.jpg
deleted file mode 100644
index 392082c1cacb7870420ff99f24fd9f6e8a42c68f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3975
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

diff --git a/src/assets/images/notifications/m.svg b/src/assets/images/notifications/m.svg
new file mode 100644
index 0000000..a5b7463
--- /dev/null
+++ b/src/assets/images/notifications/m.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="url(#pattern0_3402_19268)"/>
+<defs>
+<pattern id="pattern0_3402_19268" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3402_19268" transform="scale(0.00125)"/>
+</pattern>
+<image id="image0_3402_19268" width="800" height="800" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/src/assets/images/notifications/r.jpg b/src/assets/images/notifications/r.jpg
deleted file mode 100644
index fb2363585ae57a073d5694da49854eacc8c2b260..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2772
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
KUmXDy6aNHZ8aKuO

diff --git a/src/assets/images/notifications/r.svg b/src/assets/images/notifications/r.svg
new file mode 100644
index 0000000..abb5ee3
--- /dev/null
+++ b/src/assets/images/notifications/r.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 4C0 1.79086 1.79086 0 4 0H28C30.2091 0 32 1.79086 32 4V28C32 30.2091 30.2091 32 28 32H4C1.79086 32 0 30.2091 0 28V4Z" fill="url(#pattern0_3402_19295)"/>
+<defs>
+<pattern id="pattern0_3402_19295" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_3402_19295" transform="translate(-0.0526992) scale(0.00128535)"/>
+</pattern>
+<image id="image0_3402_19295" width="860" height="778" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/src/assets/images/notifications/w.jpg b/src/assets/images/notifications/w.jpg
deleted file mode 100644
index 6e581e70ebf3e5c3e994e96c512ab871b9a69a43..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 3916
zcmbuCX;4$yw#O4NAc8<-2*{8tgAt4dWE7D+K|oN6%%i5G4H!^EL?t#cC^C;NinL5N
zjR=UytU)8e45R^pW|T?c1Q7w1a|H2-AzZxu>b|P?>D9Yy*Z#0;uUb{Vwf0*7+H1pW
zlL%FJ7dICKQU-}Qw7w8)V+bb%@;|g6LH@%KNaR{80=*IO55zxYk!XYr8YzoLt_cuW
z1OkcrJ2v9K4JjkL0VOBDQDKwfx<ivHLIx=-E3-ish1#%T-TTV=Jz@hIwPl<60Xa2K
zio5|`eb2QUB^wPL>t1Mh^@2tgC(p+#Y|_MNX>T>&j@w~kYH4L{W4qVR>7cWV>mfIH
zZy#Sj|A4@tQ$L4>g`cKIL|?dgDTZ<Rm+J|MNy#axX*oA<<=)Qw?N0t5rT5D2mseCi
zsBdU&di;dl{FKKR2-`$|ws-XP4-5{y8Xg%1#8Ypl-_5+Aor69vE`3@43V&Pq!G%P~
z{ySxVgZ(eA^&}u=Hf)gHApe64DHF54Wzic@+sx&*9PpH<(A5m~T-&Jbc%!85g@U1l
z7pQUaeD5YrBTK*-`hoT@vi}=c{QryW-(dg4HHuJ@MXnc57L6bxq@&yj;^<8v?n5@%
zLQdtXl?^Q<N}rT5_O-U4z)QEJ25>4w65~>e1DNLE4A7GZ+*Xh{PpP0uO6}#d^Hv=6
z0a{F4#qkm9P)tk|<Bl{g4}5n5g1`EOe4zrhza6n6(z0IC2gd@Ka<a<#w+%H?aw3W>
z#W`L@ZjOaGTWR^^8sfTyJQa@NCoo*JS$e={$+=iTh;#AOsoW^8d{m3CmQS~BRa!&Z
zua$>Q|Ez!DyAAJW>N7W3<lbn;4${gvVUVO>^TO|h&Ke^ADXVvdCc&|c;Te!DRj30@
z2Id^Fa40}bEZ(|W!NLc=Upz;yXNEv|g0oI8a7_6en9{f0M@G)3ZV7xNq*ez~SDu$m
zKa4Zps&5z`wK8~SZ097?vf3+4eskVmJ&QZ~BD%G+2s&Q3Wi-@lcC31(hvZ~LoFDK?
zlim=7O*j%Z)sg4kc>@#JD?1w=9Hm5i5V~QJH5eOTHAVg0ITqz|fHxcxr!J1Nh`y~~
zFAj+;tfEYlk#?}%QbaqAxpxhLie4?e&^yIdl3ajytsl38xol}4gy9o3C3tY+0~b2E
zc<5?^X52<jI5>4|s6~%Fx2SMpd6}j^OH&J^ehxf++b*f@@>$w8Q+<QCw}woU&gMdG
z`h?=gifUI&ehu@wm)m?^;<xEyl!mFzLc93AFxIxiGS~eP`bKhBOTr0LF?Vo$jQ_}C
zWyg$f=$DYH^v@3FT};YkzSd}E=NQy>Kp1dFUV~C=Ic}I#qQ6xX{Q#~ITWn%8mGzsP
zzm|V^^4(KHSbgMxaf0>%x1PSfS~v8CEYFy4Z87hg;B!@_nv#Ryyig_0L094oa{9W6
z$xI3`GLvYvdH*|hd~j^~Q76)~=l!%Z3%Hf>>%>m@CLur~TczyYWX9%fH!Ud1>Z}{U
z*V!tu^q$}y2rAoi-Oo1mX8<Psg*d{y1uc85cnz@uZebb<|LTOc2tr}}*JMVzL7T`D
zV3`BVA&bhJkpHF`b-?3x<c+Y#%I<&=ABx94)4rNSp(lUJY&c^-A)aFsdSBW*0s0fO
zigD108hlu)&;SMl;R!5lMvSN26@wnJ=%W)*?IgCzknSG2b(&K|Cczg=sVroE#}~qf
z1h>%Y5mD$v>d;qDNzumsZi#bO<jI2D*!VphIUSVar3<BZ!k2KF!Z7p`&I7)zdzM-b
zbKs+~AKI6qO_;@xq0_*c_pZQ@CqJ*OXmuxh4UrMuP3SUvT$Wk$;)F^V`<w<Km9Keu
zf9@x`y>GUNZb{d=Oo?oM%2qm9r-gTRCw=pPW<F+%Cty>YMBRH*{|+QwBo7e77Iazt
zaf<dRfOt)FMOyPa9L&cm*#|>A4}k(rZ~h+<X0}jw^Y3%tnU^8Cwz)Ck*36GxgHMvb
z(3BZ5hrz5=poV8&=;WWpt}>C1<OVfw-)G+$#SSSS9VkoYPs5xmx>h?rJ4WVd`z6wr
zU!F0l^QyGF!5=DdEY`e@T`d8)$UVf8iC%vJCnl+J&$vx`2ob<&(XC^|&Sx5A?}P`I
zW8QL1GP~ydO6~ayemj%v$3>_$gx11l|5E=Q{9~mqE#dK97DvJ^W_S6wk{{co6DRZH
zKu>aZet4@+k1BNy(LlSlhM?A@wIHGJ)>O%XhmkFs5Rs2nkhl#>2>b7;&i|6hx5>J&
zOWqX=UXvW)K79&#+`Swb8Cf$YH2^<Vi$7un_Z3qjK%7R{#Bg6V$*48_axq5j*7u0q
zS~x>a4I8ZDwMhfFaEj_#Ds9gyEH?2;v=#3Z@9+_N3ml9=jM2);D;i8o5hE|Tldivu
zE}syhCm125s@HRrj~9h9j~9aX6>ZCdnvQT4+~TT6ice*(*El;VYKa=Em1Z^X-)R<j
zf_lB3{>}djMSOUd&2rR_DaTZT2-nQz6S$N2)(~<ICNN1%OKucXdOu0=tj;%EYvIhv
ziS)eKeCIs>0SCQ#ySrDX8tM+~*kmqPJ^Qo9>WbssC(`SxHf>zW$k8)|XUS6;Rc8EC
z6}*nZMSOgw{W*;J&4!zm_Nbs?XDv3beUN?;XF`OcO#~-7zAI=(YAzjPb!7g1sc2lU
z2+X3Ux!<==MltyLVm6sLnP#04N<t-x3%Mx4qsImTX;6Oo)e=)J{C+!gdz&lwrQO&c
zJ;l<7-VECtuTMA}OaL2%TqUMcC2Pu+1J`{gz>&w`=qW<Nr2;?ag1;Ha*~ZVF$Ld(8
zerODKqpdRx^*JV#<S;S|JcY4rmTkvpiHBU{sL#xupVe{k!fEL6n~ULBt6VWX##(`<
z?p~F)!aI+#8seJ2viY2`WP-ol$`1Nht+$2bT;Qy?o>M%B(pAgx{+0gx9M$DmE5I&C
zW&&kSD!R_6yL?2iGL<wo4VFr7NupL$SO#l|7uMW!w8TqyF&FisUtndHu-PmmMB;Nt
z&)VxfgkSMu9FV>C7t80L#-!rv{&G%unwQ1dRyzB~qKK^2I96frdp53oyc3u|8p$8!
zCR|)YprxpSs5iKHM!GC%Pj1L|@5HWJ4KVO+?H76g^`}~R)R%e^TffYDrIS?VM#ALr
zJcZwbqA!^EmG~?Aqow2U<)u`BT$bG{$~28~!R!{RY>CEhw#_pVXKyUO8!90diBhAL
zbp_MxhxJK@dl)Gcc8q<S__e;S_@(dGJ67&m`IZgt!%F?KMbpiJAaQvcy#5$b#;eUN
z(;%h+cSv#;BpipoPEDvY53b%Xc(KwG&on+exj9<&OHy+MoHNQlzBOT#mc=|?8gVps
zl9XhZIUqG<w{V+o3jCfDk{h!zjO+aDodAcVL)UjG4z&C2Ww~0x)cmRFrsT>bz7r~?
zZLlV&=|S^T#!Kg|)qt7WtvZkDL+;P*EKS5!lpeIh4SSO%j}==m1RmR*2d*Jf_r@eK
zZE`?v!m*xO-2+9Pspq9Syy@YP26SpCtD2<7AJN~psRF`k0u_DjfYaunV&7o1F7xKy
z!TE7PQlsbnai<sHop)QgO0cS8wnE$sYnCF@8=?t%(A0Z9_W~t>s})R}a>-sWoVT-8
zyiK`=0?xY(+Q)AGcr!xN(Ws@DVB9cd`90ld^)sh(hGiJ)V^+x_%1$#R9@dTcS=T*1
z@10PIon^6ZKIK=-f-zmnr-M8SN2}yDq=umZO#j3<M<UwdoWXPa{Ooa&L?<UI%Qvmb
z{wzxYjI|QdJ>uGybVJ5L+hSAEBqJh#c`&MJni%>UWh$jrY%-Yl=57=ALo>)-X2WCx
zADdbic}YeT+{ZaJN!DZR^NCZI9E5`*HGU2L4F=8xXN0OkOQ{}|oE%;p-oMbNlVbdY
z{jC3s;^EhJ%b)t<s>Mpzk%Bw1ozUDv^@x5U#hejQEYiz6RbdUn61i<Syu<E<f(vs-
z{T@Cu+Wm#Vy4uQ1e)^Z%@^p{$EIJ_-bl%kY-3Gw;SCsCnL|Bx#7{Dv0^EkdY2MSHX
znl&Tci)_WU^+k5SR=FqbR3xip@Bv7@MX?^jNi_PG>HVZ@_9T!n`9z{#!1J4=w&=kH
z05*-Kvzpg}KS5R9@@`SQaNWUhcI6enYV`!o>deCuQ1bz#v&&&$*SYVWL$q^`jK0~v
zf-pw+!KV6$HJRY-XU{gEZfTEFhffaInv&SYdn8llifhL{@Jm~!dp(%(ZRgJFx_B=c
zLf#tEx@iXk`qy4pyDCC;SfODNcqwv91$C@#(A|N5ZBeQzn6$0heC<AfcfL%wRva~j
zE048$@h78}Duo1&+j_@bSS?+efd5Nk0a{FoBx<L4{)(#wVwKbuJX{Xcj3$eP#o5+F
z-^o0poMdlpZ;RgS3g@uS@N3~zmzQl$_e${dEni84A9w98_28zAj5}1hnsmTe<<*Yi
z4;~a(;>*&bRh84jM>OmLw0ttEweiQpnvG4orz=X0D4%OeFo^**U$U(smF$+>Z-d*R
z!0?SfbM*4z{V#l>#(~lgj0vK+(2tl_7huxiDez=k#n0rPu|IukR&3@w?-lopwDWHL
z3~voFf(4jlr4}t=^@QRo%?HZP;zUpB`AVE2HF2JRh_?4;l!|QxH1(tEYH)g+zCp1T
z`Pjf#omj^2Pa6A|zVF**-O<;rQVmG4oiGhitA+B5xEOJg&fxfxetZd<Mj06_qH5o5
zLrhAJN102Gn~Q3O2~Rb9F(yObj2@R+NOssQo}Gqck~_gbj57GiIX=smC(+}5^9d*6
nfD;<+mEC3dDua$npTa11KzDWEKqXltttM5tuE3^<wUK`U*&ux`

diff --git a/src/assets/images/notifications/w.svg b/src/assets/images/notifications/w.svg
new file mode 100644
index 0000000..85e6f67
--- /dev/null
+++ b/src/assets/images/notifications/w.svg
@@ -0,0 +1,9 @@
+<svg width="32" height="32" viewBox="0 0 32 32" fill="none" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
+<path d="M0 16C0 7.16344 7.16344 0 16 0V0C24.8366 0 32 7.16344 32 16V16C32 24.8366 24.8366 32 16 32V32C7.16344 32 0 24.8366 0 16V16Z" fill="url(#pattern0_4836_20491)"/>
+<defs>
+<pattern id="pattern0_4836_20491" patternContentUnits="objectBoundingBox" width="1" height="1">
+<use xlink:href="#image0_4836_20491" transform="scale(0.00166667)"/>
+</pattern>
+<image id="image0_4836_20491" width="600" height="600" preserveAspectRatio="none" xlink:href="data:image/png;base64,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"/>
+</defs>
+</svg>
diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index 009bd7f..b2b9021 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -4,9 +4,7 @@ import {
   View,
   StyleSheet,
   ScrollView,
-  Image,
   ActivityIndicator,
-  ImageSourcePropType,
   TouchableOpacity,
 } from 'react-native';
 import { useNavigation, useFocusEffect } from '@react-navigation/native';
@@ -24,14 +22,15 @@ import Alert from '../components/Alerts';
 import { Colors, FontSizes } from '../styles/theme';
 import { NotificationService } from '../services/notifications';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
+import { SvgProps } from 'react-native-svg';
 
-import completedImg from '../assets/images/notifications/f.jpg';
-import inProgressImg from '../assets/images/notifications/r.jpg';
-import approvedImg from '../assets/images/notifications/image.jpg';
-import canceledImg from '../assets/images/notifications/w.jpg';
-import readyForPickupImg from '../assets/images/notifications/e.jpg';
-import deliveryImg from '../assets/images/notifications/m.jpg';
-import defaultIcon from '../assets/images/favicon.png';
+// Importa tus SVG como componentes React
+import CompletedSvg from '../assets/images/notifications/f.svg';
+import InProgressSvg from '../assets/images/notifications/r.svg';
+import ApprovedSvg from '../assets/images/notifications/image.svg';
+import CanceledSvg from '../assets/images/notifications/w.svg';
+import ReadyForPickupSvg from '../assets/images/notifications/e.svg';
+import DeliverySvg from '../assets/images/notifications/m.svg';
 
 type NotificationItem = {
   id: string;
@@ -43,16 +42,27 @@ type NotificationItem = {
   status: string;
 };
 
-const notificationIcons: Record<string, ImageSourcePropType> = {
-  completed: completedImg as ImageSourcePropType,
-  in_progress: inProgressImg as ImageSourcePropType,
-  approved: approvedImg as ImageSourcePropType,
-  canceled: canceledImg as ImageSourcePropType,
-  ready_for_pickup: readyForPickupImg as ImageSourcePropType,
-  delivery: deliveryImg as ImageSourcePropType,
+type NotificationResponse = {
+  id: string;
+  title: string;
+  message: string;
+  createdAt: string;
+  isRead: boolean;
+  order?: {
+    id: string;
+    status: string;
+  };
 };
 
-const defaultIconSource = defaultIcon as ImageSourcePropType;
+// Mapeo de status → componente SVG
+const notificationIcons: Record<string, React.FC<SvgProps>> = {
+  completed: CompletedSvg,
+  in_progress: InProgressSvg,
+  approved: ApprovedSvg,
+  canceled: CanceledSvg,
+  ready_for_pickup: ReadyForPickupSvg,
+  delivery: DeliverySvg,
+};
 
 export default function NotificationsScreen() {
   const navigation = useNavigation();
@@ -81,16 +91,16 @@ export default function NotificationsScreen() {
           throw new Error(errorMsg);
         }
 
-        const items = res.data.map((nt: Record<string, unknown>) => {
-          const order = (nt.order || {}) as Record<string, unknown>;
+        const items = res.data.map((nt: NotificationResponse) => {
+          const order = nt.order || { id: '', status: '' };
           return {
-            id: nt.id as string,
-            title: nt.title as string,
-            message: (nt.message as string).trim(),
-            createdAt: nt.createdAt as string,
+            id: nt.id,
+            title: nt.title,
+            message: nt.message.trim(),
+            createdAt: nt.createdAt,
             isRead: !!nt.isRead,
-            orderId: order.id as string,
-            status: order.status as string,
+            orderId: order.id,
+            status: order.status,
           };
         });
 
@@ -108,7 +118,7 @@ export default function NotificationsScreen() {
     fetchNotifications();
   }, []);
 
-  // Marca todas como leídas al enfocar o desenfocar la pantalla
+  // Marca todas como leídas al entrar o salir de la pantalla
   useFocusEffect(
     useCallback(() => {
       const markAllRead = async () => {
@@ -116,16 +126,12 @@ export default function NotificationsScreen() {
           const token = await getUserIdFromSecureStore();
           if (!token) return;
 
-          // Filtrar solo las no leídas
           const toMark = notificationsList.filter((n) => !n.isRead);
           if (toMark.length === 0) return;
 
-          // Llamar al servicio en paralelo
           await Promise.all(
             toMark.map((n) => NotificationService.markAsRead(n.orderId, token)),
           );
-
-          // Actualizar estado local
           setNotificationsList((prev) =>
             prev.map((n) => ({ ...n, isRead: true })),
           );
@@ -136,9 +142,7 @@ export default function NotificationsScreen() {
           );
         }
       };
-
       markAllRead();
-      // no necesitamos cleanup
     }, [notificationsList]),
   );
 
@@ -154,8 +158,25 @@ export default function NotificationsScreen() {
     return format(date, 'yyyy-MM-dd', { locale: es });
   };
 
-  const getNotificationIcon = (status: string): ImageSourcePropType => {
-    return notificationIcons[status] || defaultIconSource;
+  const renderNotification = (nt: NotificationItem) => {
+    const Icon = notificationIcons[nt.status];
+    return (
+      <View
+        key={nt.id}
+        style={[styles.item, !nt.isRead && styles.unreadBackground]}
+      >
+        <Icon width={32} height={32} />
+        <View style={styles.textContainer}>
+          <View style={styles.itemHeader}>
+            <PoppinsText weight="semibold">{nt.title}</PoppinsText>
+            <PoppinsText style={styles.date}>
+              {formatRelativeDate(nt.createdAt)}
+            </PoppinsText>
+          </View>
+          <PoppinsText style={styles.message}>{nt.message}</PoppinsText>
+        </View>
+      </View>
+    );
   };
 
   return (
@@ -204,26 +225,7 @@ export default function NotificationsScreen() {
         </View>
       ) : (
         <ScrollView contentContainerStyle={styles.listContainer}>
-          {notificationsList.map((nt) => (
-            <View
-              key={nt.id}
-              style={[styles.item, !nt.isRead && styles.unreadBackground]}
-            >
-              <Image
-                source={getNotificationIcon(nt.status)}
-                style={styles.icon}
-              />
-              <View style={styles.textContainer}>
-                <View style={styles.itemHeader}>
-                  <PoppinsText weight="semibold">{nt.title}</PoppinsText>
-                  <PoppinsText style={styles.date}>
-                    {formatRelativeDate(nt.createdAt)}
-                  </PoppinsText>
-                </View>
-                <PoppinsText style={styles.message}>{nt.message}</PoppinsText>
-              </View>
-            </View>
-          ))}
+          {notificationsList.map(renderNotification)}
         </ScrollView>
       )}
     </View>
@@ -287,15 +289,9 @@ const styles = StyleSheet.create({
   unreadBackground: {
     backgroundColor: '#FFFFFF',
   },
-  icon: {
-    width: 32,
-    height: 32,
-    marginRight: 12,
-    marginTop: 4,
-    borderRadius: 16,
-  },
   textContainer: {
     flex: 1,
+    marginLeft: 12,
   },
   itemHeader: {
     flexDirection: 'row',
@@ -309,7 +305,6 @@ const styles = StyleSheet.create({
   message: {
     color: Colors.textLowContrast,
     fontSize: FontSizes.c1.size,
-    marginRight: 80,
     flexWrap: 'wrap',
   },
 });

From 59a5e117712772e6e5661ad4229cd597691c3a40 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 23:15:48 -0400
Subject: [PATCH 239/291] Update @pharmatech/sdk to version 0.4.19; refactor
 CheckoutScreen to integrate payment method handling and improve order
 creation logic

---
 package-lock.json              |   8 +-
 package.json                   |   2 +-
 src/screens/CheckoutScreen.tsx | 163 +++++++++++++++------------------
 3 files changed, 79 insertions(+), 94 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 3e64c7a..06ea96e 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.13",
+        "@pharmatech/sdk": "^0.4.19",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -4026,9 +4026,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.13",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.13.tgz",
-      "integrity": "sha512-3r9KjyN2/zLadYS91k6aTitz0uC7QhG2D0LERS/rpAbw3axrVw5G4Jyj395IqPJaJYGmUKdWDv7+XMUH4pZmig==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
+      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index db6d40c..c53f454 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.13",
+    "@pharmatech/sdk": "^0.4.19",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index ec715e4..3802a1a 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -27,7 +27,6 @@ import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
 import { UserService } from '../services/user';
-import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
@@ -50,18 +49,17 @@ import {
   OrderStatus,
   Order as OrderSocketType,
 } from '../hooks/useOrderSocket';
+import {
+  OrderType,
+  CreateOrder,
+  CreateOrderDetail,
+  PaymentMethod,
+} from '@pharmatech/sdk';
 
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
-  const {
-    step,
-    option,
-    payment,
-    locationId,
-    paymentInfoValid,
-    couponDiscount,
-    couponApplied,
-  } = useSelector((state: RootState) => state.checkout);
+  const { step, option, payment, locationId, couponDiscount, couponApplied } =
+    useSelector((state: RootState) => state.checkout);
 
   const router = useRouter();
   const { cartItems } = useCart();
@@ -165,16 +163,12 @@ const CheckoutScreen = () => {
   const handleContinue = async () => {
     const missingFields: string[] = [];
 
-    if (step < stepsLabels.length - 1) {
-      // Validation for steps before the confirmation step
-      if (step === 1) {
-        if (!option) missingFields.push('Seleccionar una opción de compra.');
-        if (!locationId)
-          missingFields.push('Seleccionar una opción de locación.');
-        if (!payment) missingFields.push('Seleccionar un método de pago.');
-      } else if (step === 2 && !isSimplifiedSteps && !paymentInfoValid) {
-        missingFields.push('Completar la información de pago.');
-      }
+    // Validación para el paso 1
+    if (step === 1) {
+      if (!option) missingFields.push('Seleccionar una opción de compra.');
+      if (!locationId)
+        missingFields.push('Seleccionar una opción de locación.');
+      if (!payment) missingFields.push('Seleccionar un método de pago.');
 
       if (missingFields.length > 0) {
         setPopupMessages(missingFields);
@@ -182,98 +176,89 @@ const CheckoutScreen = () => {
         return;
       }
 
-      dispatch(setStep(step + 1));
-    } else if (step === stepsLabels.length - 1) {
-      // Ensure payment form is valid before creating the order
-      if (!isSimplifiedSteps && !paymentInfoValid) {
-        setPopupMessages(['Completar la información de pago correctamente.']);
-        setPopupVisible(true);
+      // Validar los productos del carrito
+      const products: CreateOrderDetail[] = cartItems
+        .filter((item) => item.quantity > 0)
+        .map((item) => ({
+          productPresentationId: item.id,
+          quantity: item.quantity,
+        }));
+
+      if (products.length === 0) {
+        setErrorMessage('No hay productos válidos en el carrito.');
+        setOrderStatus(null);
         return;
       }
 
-      // Create the order on the penultimate step
-      try {
-        if (option === 'pickup' && !isValidUUID(locationId)) {
-          setErrorMessage('La sucursal seleccionada no es válida.');
-          setOrderStatus(null);
-          return;
-        }
-
-        if (option === 'delivery' && !isValidUUID(locationId)) {
-          setErrorMessage('La dirección seleccionada no es válida.');
-          setOrderStatus(null);
-          return;
-        }
-
-        if (!option) {
-          setErrorMessage('Debe seleccionar una opción de compra.');
-          setOrderStatus(null);
-          return;
-        }
-
-        setErrorMessage(null);
-
-        // Validar los productos del carrito
-        const products: CreateOrderDetail[] = cartItems
-          .filter((item) => item.quantity > 0)
-          .map((item) => ({
-            productPresentationId: item.id,
-            quantity: item.quantity, // Solo incluir los campos esperados
-          }));
-
-        if (products.length === 0) {
-          setErrorMessage('No hay productos válidos en el carrito.');
-          setOrderStatus(null);
-          return;
-        }
-
-        // Log del carrito y los productos seleccionados
-        console.log('Productos en el carrito:', cartItems);
-        console.log('Productos seleccionados para la orden:', products);
+      // Validar locationId según opción
+      if (option === 'pickup' && !isValidUUID(locationId)) {
+        setErrorMessage('La sucursal seleccionada no es válida.');
+        setOrderStatus(null);
+        return;
+      }
+      if (option === 'delivery' && !isValidUUID(locationId)) {
+        setErrorMessage('La dirección seleccionada no es válida.');
+        setOrderStatus(null);
+        return;
+      }
 
-        // Construir el payload de la orden
-        const orderPayload: CreateOrder = {
-          type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
-          branchId: option === 'pickup' ? locationId || undefined : undefined,
-          userAddressId:
-            option === 'delivery' ? locationId || undefined : undefined,
-          products,
-        };
+      setErrorMessage(null);
+
+      let sdkPaymentMethod: PaymentMethod;
+      switch (payment) {
+        case 'efectivo':
+          sdkPaymentMethod = PaymentMethod.CASH;
+          break;
+        case 'punto_de_venta':
+          sdkPaymentMethod = PaymentMethod.CARD;
+          break;
+        case 'transferencia':
+          sdkPaymentMethod = PaymentMethod.BANK_TRANSFER;
+          break;
+        case 'pago_movil':
+          sdkPaymentMethod = PaymentMethod.MOBILE_PAYMENT;
+          break;
+        default:
+          sdkPaymentMethod = PaymentMethod.CASH;
+      }
 
-        // Log del payload que se enviará al backend
-        console.log('Payload enviado al backend:', orderPayload);
+      // Construir el payload de la orden
+      const orderPayload: CreateOrder = {
+        type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
+        branchId: option === 'pickup' ? locationId || undefined : undefined,
+        userAddressId:
+          option === 'delivery' ? locationId || undefined : undefined,
+        products,
+        paymentMethod: sdkPaymentMethod,
+      };
 
+      try {
         // Enviar la orden al backend
         const orderResponse = await OrderService.create(orderPayload);
 
-        // Log de la respuesta del backend
-        console.log('Respuesta del backend:', orderResponse);
-
-        // Validar la respuesta
         if (!orderResponse?.id) {
           setErrorMessage(
             'No pudimos procesar tu orden. Inténtalo nuevamente.',
           );
-
           setOrderStatus(null);
           return;
         }
 
-        // Guardar el número de orden generado y el status inicial
         setOrderNumber(orderResponse.id);
         setOrderStatus(orderResponse.status);
 
-        console.log('Orden creada exitosamente:', orderResponse);
-
-        dispatch(setStep(step + 1)); // Move to the confirmation step
+        // Ir siempre a la confirmación de orden, sin importar el tipo de orden
+        dispatch(setStep(stepsLabels.length));
       } catch (error) {
         console.error('Error al procesar la orden:', error);
         setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
-
         setOrderStatus(null);
       }
-    } else if (step === stepsLabels.length) {
-      // Limpiar el carrito al salir del flujo de checkout
+      return;
+    }
+
+    // Paso de confirmación (último paso)
+    if (step === stepsLabels.length) {
       dispatch(clearCart());
       dispatch(resetCheckout());
       router.dismissAll();
@@ -504,8 +489,8 @@ const CheckoutScreen = () => {
             </View>
             <Button
               title={
-                step === 2 && !isSimplifiedSteps
-                  ? 'Confirmar Pago'
+                step === 1
+                  ? 'Realizar Pago'
                   : step < stepsLabels.length
                     ? 'Continuar'
                     : 'Volver al Home'

From b301ea5b8c61dce54ee95ac209d64030b7618b0d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 20 May 2025 23:19:35 -0400
Subject: [PATCH 240/291] Refactor PaymentInformationService.findAll to return
 response directly as an array of PaymentInfoResponse

---
 src/services/paymentInformation.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index bc627ae..66ecdf7 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -16,8 +16,8 @@ export const PaymentInformationService = {
       // Llamar al método findAll con el argumento directamente
       const response = await api.paymentInformation.findAll(paymentMethod);
 
-      // La respuesta ahora es directamente un array de PaymentInfoResponse
-      return [response];
+      // Devolver la respuesta directamente (se asume que ya es un array)
+      return response;
     } catch (error) {
       console.error('Error en PaymentInformationService.findAll:', error);
       throw new Error(extractErrorMessage(error));

From b14d0b5608fc319be8ee20e722e2e5d960f35e88 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 21 May 2025 10:49:06 -0400
Subject: [PATCH 241/291] Fix PaymentInformationService to return response
 directly instead of wrapping it in an array

---
 src/services/paymentInformation.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index bc627ae..850c59d 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -17,7 +17,7 @@ export const PaymentInformationService = {
       const response = await api.paymentInformation.findAll(paymentMethod);
 
       // La respuesta ahora es directamente un array de PaymentInfoResponse
-      return [response];
+      return response;
     } catch (error) {
       console.error('Error en PaymentInformationService.findAll:', error);
       throw new Error(extractErrorMessage(error));

From f3900086c17d616d9c1ee6c5d9d8bcebc4e25c8d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 21 May 2025 10:54:42 -0400
Subject: [PATCH 242/291] Refactor PaymentInformationService to return response
 directly without wrapping in an array

---
 src/services/paymentInformation.ts | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index 850c59d..4ed9e2a 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -13,11 +13,11 @@ export const PaymentInformationService = {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      // Llamar al método findAll con el argumento directamente
+      // Call the API method
       const response = await api.paymentInformation.findAll(paymentMethod);
 
-      // La respuesta ahora es directamente un array de PaymentInfoResponse
-      return response;
+      // Ensure the response is an array
+      return Array.isArray(response) ? response : [response];
     } catch (error) {
       console.error('Error en PaymentInformationService.findAll:', error);
       throw new Error(extractErrorMessage(error));

From a2db7355a63d55246a580c23836f0184839366ca Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Wed, 21 May 2025 13:19:02 -0400
Subject: [PATCH 243/291] Updating to latest sdk version

---
 package-lock.json | 8 ++++----
 package.json      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95c5fb0..ac7f9d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.11",
+        "@pharmatech/sdk": "^0.4.19",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,9 +3592,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
-      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
+      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 62c765a..bd58b0d 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,14 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.11",
+    "@pharmatech/sdk": "^0.4.19",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
+    "expo-dev-client": "~5.0.20",
     "expo-font": "~13.0.4",
     "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
@@ -51,8 +52,7 @@
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "socket.io-client": "^4.8.1",
-    "tailwindcss": "^3.4.17",
-    "expo-dev-client": "~5.0.20"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

From 008db41373c280337b1c0cf240edba9aedafb950 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 21 May 2025 16:06:18 -0400
Subject: [PATCH 244/291] Refactor product and offer handling to utilize promo
 discounts and update component structure

---
 src/components/Card.tsx           |  26 ++---
 src/components/OfferCardProps.tsx | 171 ------------------------------
 src/screens/tab/HomeScreen.tsx    | 134 +++++++++++++----------
 src/screens/tab/OffersScreen.tsx  |  95 +++++++++++++----
 src/types/Product.ts              |   4 +-
 5 files changed, 165 insertions(+), 265 deletions(-)
 delete mode 100644 src/components/OfferCardProps.tsx

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 4c6a046..07fc9a6 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
+import { View, StyleSheet, Image, TouchableOpacity, Text } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
 import CardButton from './CardButton';
@@ -15,13 +15,17 @@ const ProductCard: React.FC<Product> = ({
   imageUrl,
   name,
   category,
-  //originalPrice,
-  //discount,
+  originalPrice,
+  discount,
   finalPrice,
   getQuantity,
 }) => {
   const { getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
+  const computedFinalPrice = discount
+    ? (finalPrice * (100 - discount)) / 100
+    : finalPrice;
+
   return (
     <TouchableOpacity
       onPress={() =>
@@ -66,22 +70,20 @@ const ProductCard: React.FC<Product> = ({
         </View>
         <View style={styles.description}>
           <PoppinsText style={styles.name}>{truncateString(name)}</PoppinsText>
-          {/** 
           {discount && (
             <View style={styles.priceContainer}>
               <PoppinsText style={styles.originalPrice}>
-                ${originalPrice}
+                <Text>${originalPrice}</Text>
+              </PoppinsText>
+              <PoppinsText style={styles.discount}>
+                <Text>{discount}%</Text>
               </PoppinsText>
-              <PoppinsText style={styles.discount}>{discount}%</PoppinsText> // Comentado 
             </View>
-          )}*/}
+          )}
           <PoppinsText
-            style={[
-              styles.finalPrice,
-              //!discount && { color: Colors.semanticInfo },
-            ]}
+            style={[styles.finalPrice, !discount && { color: Colors.textMain }]}
           >
-            ${finalPrice}
+            <Text>${computedFinalPrice}</Text>
           </PoppinsText>
         </View>
       </View>
diff --git a/src/components/OfferCardProps.tsx b/src/components/OfferCardProps.tsx
deleted file mode 100644
index 8d5d0f5..0000000
--- a/src/components/OfferCardProps.tsx
+++ /dev/null
@@ -1,171 +0,0 @@
-// src/components/OfferCard.tsx
-
-import React from 'react';
-import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
-import { Colors, FontSizes } from '../styles/theme';
-import PoppinsText from './PoppinsText';
-import CardButton from './CardButton';
-import { truncateString } from '../utils/commons';
-import { useCart } from '../hooks/useCart';
-import { useRouter } from 'expo-router';
-
-export interface OfferCardProps {
-  id: string;
-  presentationId: string;
-  productId: string;
-  imageUrl: string;
-  name: string;
-  category: string;
-  originalPrice: number;
-  discount: number;
-  finalPrice: number;
-  getQuantity?: (qty: number) => void;
-}
-
-const OfferCard: React.FC<OfferCardProps> = ({
-  id,
-  presentationId,
-  productId,
-  imageUrl,
-  name,
-  category,
-  originalPrice,
-  discount,
-  finalPrice,
-  getQuantity,
-}) => {
-  const { getItemQuantity, updateCartQuantity } = useCart();
-  const router = useRouter();
-
-  return (
-    <TouchableOpacity
-      onPress={() =>
-        router.push(`/products/${productId}/presentation/${presentationId}`)
-      }
-    >
-      <View style={styles.card}>
-        <View style={styles.imageTagWrapper}>
-          <View style={styles.tagRow}>
-            <PoppinsText style={styles.tag}>{category}</PoppinsText>
-          </View>
-          <View style={styles.imageContainer}>
-            <Image source={{ uri: imageUrl }} style={styles.image} />
-            <View style={styles.cardButtonContainer}>
-              <CardButton
-                getValue={(qty) => {
-                  getQuantity?.(qty);
-                  updateCartQuantity(id, qty);
-                }}
-                initialValue={getItemQuantity(id)}
-              />
-            </View>
-          </View>
-        </View>
-        <View style={styles.description}>
-          <PoppinsText style={styles.name}>
-            {truncateString(name, 25)}
-          </PoppinsText>
-          <View style={styles.priceContainer}>
-            <PoppinsText style={styles.originalPrice}>
-              ${originalPrice.toFixed(2)}
-            </PoppinsText>
-            <PoppinsText style={styles.discountBadge}>
-              {discount.toFixed(0)}%
-            </PoppinsText>
-          </View>
-          <PoppinsText style={styles.finalPrice}>
-            ${finalPrice.toFixed(2)}
-          </PoppinsText>
-        </View>
-      </View>
-    </TouchableOpacity>
-  );
-};
-
-const styles = StyleSheet.create({
-  card: {
-    margin: 10,
-    backgroundColor: Colors.menuWhite,
-    borderWidth: 1,
-    borderColor: Colors.gray_100,
-    borderRadius: 15,
-    padding: 10,
-    paddingBottom: 5,
-    marginBottom: 16,
-    maxWidth: 140,
-    minWidth: 140,
-    minHeight: 315,
-    maxHeight: 315,
-  },
-  imageTagWrapper: {
-    width: '100%',
-    height: 135,
-    marginBottom: 30,
-  },
-  tagRow: {
-    width: '100%',
-    flexDirection: 'row-reverse',
-  },
-  tag: {
-    backgroundColor: Colors.semanticInfo,
-    borderRadius: 50,
-    paddingHorizontal: 9,
-    color: Colors.textWhite,
-    fontSize: FontSizes.c3.size,
-    maxWidth: '100%',
-  },
-  imageContainer: {
-    minHeight: 118,
-    maxHeight: 118,
-    maxWidth: 114,
-    borderRadius: 15,
-    marginVertical: 8,
-  },
-  image: {
-    width: 114,
-    height: 118,
-    borderRadius: 14,
-  },
-  cardButtonContainer: {
-    position: 'relative',
-    top: -30,
-    left: 58,
-    maxWidth: '65%',
-    alignItems: 'flex-end',
-    zIndex: 999,
-  },
-  description: {
-    marginHorizontal: 2,
-    justifyContent: 'center',
-  },
-  name: {
-    fontSize: FontSizes.s2.size,
-    marginBottom: 6,
-    minHeight: 70,
-    maxHeight: 70,
-  },
-  priceContainer: {
-    flexDirection: 'row',
-    alignItems: 'center',
-  },
-  originalPrice: {
-    fontSize: FontSizes.b1.size,
-    color: Colors.disableText,
-    textDecorationLine: 'line-through',
-    marginRight: 14,
-  },
-  discountBadge: {
-    fontSize: FontSizes.c1.size,
-    backgroundColor: Colors.semanticInfo,
-    borderRadius: 4,
-    paddingHorizontal: 4,
-    color: Colors.textWhite,
-  },
-  finalPrice: {
-    fontSize: FontSizes.s1.size,
-    fontWeight: 'medium',
-    color: Colors.textMain,
-  },
-});
-
-export default OfferCard;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index ad91bf1..395e00b 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -8,6 +8,7 @@ import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
 import { ProductService } from '../../services/products';
 import { Product } from '../../types/Product';
+import type { Promo } from '@pharmatech/sdk';
 import EmailVerificationModal from './EmailVerificationModal';
 import { decodeJWT } from '../../helper/jwtHelper';
 
@@ -63,7 +64,76 @@ export default function HomeScreen() {
       const productsData = await ProductService.getProducts(1, 20);
       if (productsData.success) {
         const pd = productsData.data.results;
-        const carouselProducts = pd.map((p) => ({
+        const carouselProducts = pd.map((p) => {
+          // Usa el descuento real si hay promo, si no, no lo agregues
+          // @ts-expect-error: promo puede estar en p o en p.presentation
+          const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+          const discount: Promo['discount'] | undefined = promo?.discount
+            ? Math.round(promo.discount * 100) / 100
+            : undefined;
+          return {
+            id: p.id,
+            presentationId: p.presentation.id,
+            productId: p.product.id,
+            imageUrl: p.product.images[0].url,
+            name:
+              p.product.name +
+              ' ' +
+              p.presentation.name +
+              ' ' +
+              p.presentation.quantity +
+              ' ' +
+              p.presentation.measurementUnit,
+            category: p.product.categories[0].name,
+            originalPrice: p.price,
+            ...(discount !== undefined ? { discount } : {}),
+            finalPrice: p.price,
+            quantity: getItemQuantity(p.id),
+            getQuantity: (quantity: number) => {
+              addToCart({
+                id: p.id,
+                name:
+                  p.product.name +
+                  ' ' +
+                  p.presentation.name +
+                  ' ' +
+                  p.presentation.quantity +
+                  ' ' +
+                  p.presentation.measurementUnit,
+                price: p.price,
+                quantity,
+                image:
+                  p.product.images?.[0]?.url ||
+                  'https://via.placeholder.com/150',
+              });
+              updateCartQuantity(p.id, quantity);
+            },
+          };
+        });
+
+        setProducts(carouselProducts);
+      } else {
+        console.log(productsData.error);
+      }
+    } catch (error) {
+      console.error('Error fetching products:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const obtainRecommendedProducts = async () => {
+    setLoadingRecommendations(true);
+    try {
+      const recommendations = await ProductService.getRecommendations();
+      const carouselRecommendations = recommendations.results.map((p) => {
+        // Usa el descuento real si hay promo, si no, no lo agregues
+        // @ts-expect-error: promo puede estar en p o en p.presentation
+        const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+        const discount: Promo['discount'] | undefined = promo?.discount
+          ? Math.round(promo.discount * 100) / 100
+          : undefined;
+        return {
           id: p.id,
           presentationId: p.presentation.id,
           productId: p.product.id,
@@ -76,9 +146,9 @@ export default function HomeScreen() {
             p.presentation.quantity +
             ' ' +
             p.presentation.measurementUnit,
-          category: p.product.categories[0].name,
-          //originalPrice: p.price,
-          //discount: 10,
+          category: p.product.categories[0]?.name || 'Sin categoría',
+          originalPrice: p.price,
+          ...(discount !== undefined ? { discount } : {}),
           finalPrice: p.price,
           quantity: getItemQuantity(p.id),
           getQuantity: (quantity: number) => {
@@ -99,60 +169,8 @@ export default function HomeScreen() {
             });
             updateCartQuantity(p.id, quantity);
           },
-        }));
-
-        setProducts(carouselProducts);
-      } else {
-        console.log(productsData.error);
-      }
-    } catch (error) {
-      console.error('Error fetching products:', error);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const obtainRecommendedProducts = async () => {
-    setLoadingRecommendations(true);
-    try {
-      const recommendations = await ProductService.getRecommendations();
-      const carouselRecommendations = recommendations.results.map((p) => ({
-        id: p.id,
-        presentationId: p.presentation.id,
-        productId: p.product.id,
-        imageUrl: p.product.images[0].url,
-        name:
-          p.product.name +
-          ' ' +
-          p.presentation.name +
-          ' ' +
-          p.presentation.quantity +
-          ' ' +
-          p.presentation.measurementUnit,
-        category: p.product.categories[0]?.name || 'Sin categoría',
-        //originalPrice: p.price,
-        //discount: 10,
-        finalPrice: p.price,
-        quantity: getItemQuantity(p.id),
-        getQuantity: (quantity: number) => {
-          addToCart({
-            id: p.id,
-            name:
-              p.product.name +
-              ' ' +
-              p.presentation.name +
-              ' ' +
-              p.presentation.quantity +
-              ' ' +
-              p.presentation.measurementUnit,
-            price: p.price,
-            quantity,
-            image:
-              p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
-          });
-          updateCartQuantity(p.id, quantity);
-        },
-      }));
+        };
+      });
 
       setRecommendedProducts(carouselRecommendations);
     } catch (error) {
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 0be6b3c..ea647a3 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -9,28 +9,69 @@ import {
 } from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
 import { Colors, FontSizes } from '../../styles/theme';
-import OfferCard from '../../components/OfferCardProps';
+import Card from '../../components/Card';
 import { ProductService } from '../../services/products';
-import { ProductPresentation } from '../../types/api.d';
+import type { Promo } from '@pharmatech/sdk';
 
 export default function OffersScreen() {
-  const [offers, setOffers] = useState<ProductPresentation[]>([]);
+  const [offers, setOffers] = useState<
+    Array<{
+      id: string;
+      presentationId: string;
+      productId: string;
+      imageUrl: string;
+      name: string;
+      category: string;
+      originalPrice: number;
+      discount: number;
+      finalPrice: number;
+      quantity: number;
+      getQuantity: (quantity: number) => void;
+    }>
+  >([]);
   const [loading, setLoading] = useState(false);
 
   const loadOffers = async () => {
     setLoading(true);
     const res = await ProductService.getProducts(1, 50);
     if (res.success) {
+      // Solo productos con promo
       const promoItems = res.data.results.filter((item) =>
-        // puede venir en item.promo o dentro de item.presentation.promo
         Boolean(
-          // @ts-expect-error - promo puede estar en item o en item.presentation
           item.promo?.discount ??
             // @ts-expect-error - promo puede estar en item o en item.presentation
             item.presentation.promo?.discount,
         ),
       );
-      setOffers(promoItems);
+      // Mapear la info igual que en HomeScreen
+      const mappedPromoItems = promoItems.map((p) => {
+        // @ts-expect-error: promo puede estar en p o en p.presentation
+        const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+        const discount: Promo['discount'] = promo?.discount ?? 0;
+        // No calcular el finalPrice aquí
+        return {
+          id: p.id,
+          presentationId: p.presentation.id,
+          productId: p.product.id,
+          imageUrl:
+            p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
+          name:
+            p.product.name +
+            ' ' +
+            p.presentation.name +
+            ' ' +
+            p.presentation.quantity +
+            ' ' +
+            p.presentation.measurementUnit,
+          category: p.product.categories?.[0]?.name || 'Sin categoría',
+          originalPrice: p.price,
+          discount,
+          finalPrice: p.price,
+          quantity: 0,
+          getQuantity: () => 0,
+        };
+      });
+      setOffers(mappedPromoItems);
     } else {
       console.error('Error al cargar productos:', res.error);
     }
@@ -49,24 +90,34 @@ export default function OffersScreen() {
     );
   }
 
-  const renderOffer = ({ item }: ListRenderItemInfo<ProductPresentation>) => {
-    // @ts-expect-error: asumimos que existe promo en alguna de estas rutas
-    const promo = item.promo ?? item.presentation.promo;
-    const discount = promo?.discount ?? 0;
-    const finalPrice = item.price * (1 - discount / 100);
-
+  const renderOffer = ({
+    item,
+  }: ListRenderItemInfo<{
+    id: string;
+    presentationId: string;
+    productId: string;
+    imageUrl: string;
+    name: string;
+    category: string;
+    originalPrice: number;
+    discount: number;
+    finalPrice: number;
+    quantity: number;
+    getQuantity: (quantity: number) => void;
+  }>) => {
     return (
-      <OfferCard
+      <Card
         id={item.id}
-        presentationId={item.id}
-        productId={item.product.id}
-        imageUrl={item.product.images[0]?.url}
-        name={item.product.genericName ?? item.product.name}
-        category={item.product.categories?.[0]?.name ?? ''}
-        originalPrice={item.price}
-        discount={discount}
-        finalPrice={finalPrice}
-        getQuantity={() => {}}
+        presentationId={item.presentationId}
+        productId={item.productId}
+        imageUrl={item.imageUrl}
+        name={item.name}
+        category={item.category}
+        originalPrice={item.originalPrice}
+        discount={item.discount}
+        finalPrice={item.finalPrice}
+        quantity={item.quantity}
+        getQuantity={item.getQuantity}
       />
     );
   };
diff --git a/src/types/Product.ts b/src/types/Product.ts
index b037903..a759249 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -5,8 +5,8 @@ export type Product = {
   imageUrl: string;
   name: string;
   category: string;
-  //originalPrice: number;
-  //discount: number;
+  originalPrice?: number;
+  discount?: number;
   finalPrice: number;
   quantity: number;
   getQuantity: (quantity: number) => void;

From c832eb597727c286d41b1b26d1b9ca6e6c1a206a Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 21 May 2025 16:36:56 -0400
Subject: [PATCH 245/291] Refactor

---
 src/components/Card.tsx          | 10 ++++------
 src/screens/tab/OffersScreen.tsx | 18 +++++++++++-------
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 07fc9a6..6f85d63 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -1,5 +1,5 @@
 import React from 'react';
-import { View, StyleSheet, Image, TouchableOpacity, Text } from 'react-native';
+import { View, StyleSheet, Image, TouchableOpacity } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from './PoppinsText';
 import CardButton from './CardButton';
@@ -73,17 +73,15 @@ const ProductCard: React.FC<Product> = ({
           {discount && (
             <View style={styles.priceContainer}>
               <PoppinsText style={styles.originalPrice}>
-                <Text>${originalPrice}</Text>
-              </PoppinsText>
-              <PoppinsText style={styles.discount}>
-                <Text>{discount}%</Text>
+                ${originalPrice}
               </PoppinsText>
+              <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
             </View>
           )}
           <PoppinsText
             style={[styles.finalPrice, !discount && { color: Colors.textMain }]}
           >
-            <Text>${computedFinalPrice}</Text>
+            ${computedFinalPrice}
           </PoppinsText>
         </View>
       </View>
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index ea647a3..0a66b0f 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -14,6 +14,12 @@ import { ProductService } from '../../services/products';
 import type { Promo } from '@pharmatech/sdk';
 
 export default function OffersScreen() {
+  type PresentationWithPromo = typeof ProductService.getProducts extends (
+    ...args: unknown[]
+  ) => Promise<{ data: { results: Array<unknown> } }>
+    ? { promo?: Promo }
+    : { promo?: Promo };
+
   const [offers, setOffers] = useState<
     Array<{
       id: string;
@@ -35,20 +41,18 @@ export default function OffersScreen() {
     setLoading(true);
     const res = await ProductService.getProducts(1, 50);
     if (res.success) {
-      // Solo productos con promo
       const promoItems = res.data.results.filter((item) =>
         Boolean(
           item.promo?.discount ??
-            // @ts-expect-error - promo puede estar en item o en item.presentation
-            item.presentation.promo?.discount,
+            (item.presentation as PresentationWithPromo)?.promo?.discount,
         ),
       );
-      // Mapear la info igual que en HomeScreen
+
       const mappedPromoItems = promoItems.map((p) => {
-        // @ts-expect-error: promo puede estar en p o en p.presentation
-        const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+        const promo: Promo | undefined =
+          p.promo ?? (p.presentation as PresentationWithPromo)?.promo;
         const discount: Promo['discount'] = promo?.discount ?? 0;
-        // No calcular el finalPrice aquí
+
         return {
           id: p.id,
           presentationId: p.presentation.id,

From 5cba7713fd1162c75f8c50fb09ce16c8468c1644 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 21 May 2025 16:42:26 -0400
Subject: [PATCH 246/291] Add a type guard hasPromo to safely check for the
 promo

---
 src/screens/tab/OffersScreen.tsx | 22 +++++++++-------------
 1 file changed, 9 insertions(+), 13 deletions(-)

diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 0a66b0f..0bd9b5f 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -14,12 +14,6 @@ import { ProductService } from '../../services/products';
 import type { Promo } from '@pharmatech/sdk';
 
 export default function OffersScreen() {
-  type PresentationWithPromo = typeof ProductService.getProducts extends (
-    ...args: unknown[]
-  ) => Promise<{ data: { results: Array<unknown> } }>
-    ? { promo?: Promo }
-    : { promo?: Promo };
-
   const [offers, setOffers] = useState<
     Array<{
       id: string;
@@ -37,20 +31,22 @@ export default function OffersScreen() {
   >([]);
   const [loading, setLoading] = useState(false);
 
+  function hasPromo(item: {
+    [key: string]: unknown;
+  }): item is { promo?: Promo } {
+    return 'promo' in item && typeof item.promo !== 'undefined';
+  }
+
   const loadOffers = async () => {
     setLoading(true);
     const res = await ProductService.getProducts(1, 50);
     if (res.success) {
-      const promoItems = res.data.results.filter((item) =>
-        Boolean(
-          item.promo?.discount ??
-            (item.presentation as PresentationWithPromo)?.promo?.discount,
-        ),
+      const promoItems = res.data.results.filter(
+        (item) => hasPromo(item) && Boolean(item.promo?.discount),
       );
 
       const mappedPromoItems = promoItems.map((p) => {
-        const promo: Promo | undefined =
-          p.promo ?? (p.presentation as PresentationWithPromo)?.promo;
+        const promo: Promo | undefined = hasPromo(p) ? p.promo : undefined;
         const discount: Promo['discount'] = promo?.discount ?? 0;
 
         return {

From 7a8385cd9f1843f0174024643a898c69b04fadea Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 23 May 2025 12:47:24 -0400
Subject: [PATCH 247/291] Enhance cart functionality to support discounts

---
 src/components/Card.tsx         | 12 ++++++--
 src/components/OrderSummary.tsx | 46 +++++++++++++++++-----------
 src/redux/slices/cartSlice.ts   |  2 ++
 src/screens/CartListScreen.tsx  | 53 +++++++++++++++++++--------------
 4 files changed, 71 insertions(+), 42 deletions(-)

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 6f85d63..d44247c 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -20,7 +20,7 @@ const ProductCard: React.FC<Product> = ({
   finalPrice,
   getQuantity,
 }) => {
-  const { getItemQuantity, updateCartQuantity } = useCart();
+  const { getItemQuantity, addToCart } = useCart();
   const router = useRouter();
   const computedFinalPrice = discount
     ? (finalPrice * (100 - discount)) / 100
@@ -61,7 +61,15 @@ const ProductCard: React.FC<Product> = ({
               <CardButton
                 getValue={(quantity) => {
                   if (getQuantity) getQuantity(quantity);
-                  updateCartQuantity(id, quantity);
+                  // Asegura que price siempre sea number
+                  addToCart({
+                    id,
+                    name,
+                    price: originalPrice ?? 0,
+                    quantity,
+                    image: imageUrl,
+                    discount: discount ?? 0,
+                  });
                 }}
                 initialValue={getItemQuantity(id)}
               />
diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 978f236..45e56f4 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -14,26 +14,29 @@ const OrderSummary = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  // const totalDiscount = cartItems.reduce(
-  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
-  //   0,
-  // );
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
+    0,
+  );
+  const total = subtotal - totalDiscount;
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    // const discount = 10; // Comentado
-    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
-    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
+    const discount = item.discount ?? 0;
+    const discountedPrice = item.price * (1 - discount / 100);
+    const totalDiscountedPrice = discountedPrice * item.quantity;
     const totalOriginalPrice = item.price * item.quantity;
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
-          {/** 
-          <View style={styles.discountBadge}>
-            <PoppinsText style={styles.discountBadgeText}>
-              -10%
-            </PoppinsText>
-          </View>*/}
+          {discount > 0 && (
+            <View style={styles.discountBadge}>
+              <PoppinsText style={styles.discountBadgeText}>
+                -{discount}%
+              </PoppinsText>
+            </View>
+          )}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -44,15 +47,14 @@ const OrderSummary = () => {
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <PoppinsText style={styles.productTotalPrice}>
-              ${totalOriginalPrice.toFixed(2)}
+              ${totalDiscountedPrice.toFixed(2)}
             </PoppinsText>
           </View>
-          {/**
           <PoppinsText style={styles.productOriginalPrice}>
             ${totalOriginalPrice.toFixed(2)}
-          </PoppinsText> */}
+          </PoppinsText>
           <PoppinsText style={styles.productPrice}>
-            (${item.price} c/u)
+            (${discountedPrice.toFixed(2)} c/u)
           </PoppinsText>
           <PoppinsText style={styles.productQuantity}>
             Cantidad: {item.quantity}
@@ -107,7 +109,15 @@ const OrderSummary = () => {
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
-              <PoppinsText style={styles.discountText}>-$0.00</PoppinsText>
+              <PoppinsText style={styles.discountText}>
+                -${totalDiscount.toFixed(2)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.subtotalText}>Total</PoppinsText>
+              <PoppinsText style={styles.subtotalText}>
+                ${total.toFixed(2)}
+              </PoppinsText>
             </View>
           </View>
         </>
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 26183bc..9505d0d 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -6,6 +6,7 @@ export type CartItem = {
   price: number;
   quantity: number;
   image: string;
+  discount?: number;
 };
 
 type CartState = {
@@ -40,6 +41,7 @@ const cartSlice = createSlice({
       );
       if (existingItem) {
         existingItem.quantity = action.payload.quantity;
+        existingItem.discount = action.payload.discount;
       } else {
         state.items.push(action.payload);
       }
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index c2151aa..4ae6477 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -22,28 +22,33 @@ const CartListScreen = () => {
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
-  ); // Total price sum
-  // const totalDiscount = cartItems.reduce(
-  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
-  //   0,
-  // ); // Discount sum
-  const total = subtotal; // Subtotal without discount
+  );
+  // Total price sum
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
+    0,
+  ); // Discount sum
+  const total = subtotal - totalDiscount; // Subtotal with discount
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    // const discount = 10; // Comentado
-    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
-    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
-    const totalOriginalPrice = item.price * item.quantity; // Original total price
+    // Usar el descuento del item, si existe, si no 0
+    const discount = item.discount ?? 0;
+    const discountedPrice = item.price * (1 - discount / 100);
+    const totalDiscountedPrice = discountedPrice * item.quantity;
+    const totalOriginalPrice = item.price * item.quantity;
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
           {/* Discount badge */}
-          {/* <View style={styles.discountBadge}>
-            <PoppinsText style={styles.discountBadgeText}>
-              -{discount}%
-            </PoppinsText>
-          </View> */}
+          {discount > 0 && (
+            <View style={styles.discountBadge}>
+              <PoppinsText style={styles.discountBadgeText}>
+                -{discount}%
+              </PoppinsText>
+            </View>
+          )}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -53,13 +58,17 @@ const CartListScreen = () => {
         <View style={styles.detailsContainer}>
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
-            <PoppinsText style={styles.productTotalPrice}>
-              ${totalOriginalPrice.toFixed(2)}
-              {/* Original total price */}
-            </PoppinsText>
+            <View style={{ alignItems: 'flex-end' }}>
+              <PoppinsText style={styles.productTotalPrice}>
+                ${totalDiscountedPrice.toFixed(2)}
+              </PoppinsText>
+              <PoppinsText style={styles.productOriginalPrice}>
+                ${totalOriginalPrice.toFixed(2)}
+              </PoppinsText>
+            </View>
           </View>
           <PoppinsText style={styles.productPrice}>
-            (${item.price} c/u)
+            (${discountedPrice.toFixed(2)} c/u)
           </PoppinsText>
           <View style={styles.quantityContainer}>
             <CardButton
@@ -121,12 +130,12 @@ const CartListScreen = () => {
                 ${subtotal.toFixed(2)}
               </PoppinsText>
             </View>
-            {/* <View style={styles.row}>
+            <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
               <PoppinsText style={styles.discountText}>
                 -${totalDiscount.toFixed(2)}
               </PoppinsText>
-            </View> */}
+            </View>
             <View style={styles.row}>
               <PoppinsText style={styles.totalText}>Total</PoppinsText>
               <PoppinsText style={styles.totalText}>

From 15d158c9bd6f637152af14f0933a4e041cbcaf8d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 23 May 2025 19:39:00 -0400
Subject: [PATCH 248/291] Implement SSE for real-time notifications and remove
 polling mechanism

---
 src/hooks/useNotifications.ts | 84 ++++++++++++++++++++++++++++-------
 1 file changed, 68 insertions(+), 16 deletions(-)

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 127bb31..3e60b77 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -1,5 +1,3 @@
-// src/context/NotificationsContext.ts
-
 import React, {
   createContext,
   useContext,
@@ -12,6 +10,9 @@ import { NotificationService } from '../services/notifications';
 import { NotificationResponse } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
+import EventSource, { EventSourceListener } from 'react-native-sse';
+import * as SecureStore from 'expo-secure-store';
+import { api } from '../lib/sdkConfig';
 
 export type Notification = NotificationResponse & { isRead: boolean };
 
@@ -58,20 +59,6 @@ export function NotificationsProvider(props: { children: ReactNode }) {
     }
   }, []);
 
-  // carga inicial
-  useEffect(() => {
-    void refreshNotifications();
-  }, [refreshNotifications]);
-
-  // polling automático cada 30 segundos
-  useEffect(() => {
-    const interval = setInterval(() => {
-      void refreshNotifications();
-    }, 30_000); // ajusta intervalo según necesidad
-
-    return () => clearInterval(interval);
-  }, [refreshNotifications]);
-
   const markAsRead = useCallback(async (notificationId: string) => {
     try {
       const token = await getUserIdFromSecureStore();
@@ -106,6 +93,71 @@ export function NotificationsProvider(props: { children: ReactNode }) {
     }
   }, []);
 
+  // SSE: Real-time notifications
+  useEffect(() => {
+    let es: EventSource | null = null;
+
+    async function setupSSE() {
+      try {
+        const token = await SecureStore.getItemAsync('auth_token');
+        if (!token) return;
+
+        // Usa el api de sdkConfig para obtener el cliente y baseURL
+        const axiosClient = api.client['client'];
+        const baseURL: string | undefined = axiosClient?.getUri
+          ? axiosClient.getUri({ url: '' })
+          : axiosClient?.defaults?.baseURL;
+        if (!baseURL) return;
+
+        const url = `${baseURL.replace(/\/$/, '')}/notification/stream`;
+
+        es = new EventSource(url, {
+          headers: {
+            Authorization: `Bearer ${token}`,
+          },
+          lineEndingCharacter: '\n',
+        });
+
+        const listener: EventSourceListener = (event) => {
+          console.log('Evento SSE recibido:', event.type);
+          if (event.type === 'open') {
+            console.log('Conexión SSE abierta');
+          } else if (event.type === 'message') {
+            console.log('[SSE] Tipo: message');
+            console.log('[SSE] Event object:', event);
+            console.log('[SSE] Raw data:', event.data);
+            if (typeof event.data === 'string') {
+              const notif = JSON.parse(event.data) as NotificationResponse;
+              console.log('[SSE] Parsed notification:', notif);
+              setNotifications((prev) => {
+                void refreshNotifications();
+                if (prev.some((n) => n.id === notif.id)) return prev;
+                return [{ ...notif, isRead: Boolean(notif.isRead) }, ...prev];
+              });
+            }
+          } else if (event.type === 'error') {
+            console.error('Error SSE:', event);
+          }
+        };
+
+        es.addEventListener('open', listener);
+        es.addEventListener('message', listener);
+        es.addEventListener('error', listener);
+      } catch (err) {
+        console.error('Error inicializando SSE para notificaciones:', err);
+      }
+    }
+
+    setupSSE();
+
+    return () => {
+      if (es) {
+        es.removeAllEventListeners();
+        es.close();
+      }
+    };
+  }, [refreshNotifications]);
+
   return React.createElement(
     NotificationsContext.Provider,
     {

From df00381cc0186cd507fb3984c91d4b864d6ab8aa Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Fri, 23 May 2025 19:46:43 -0400
Subject: [PATCH 249/291] Add react-native-sse dependency for server-sent
 events support

---
 package-lock.json | 6 ++++++
 package.json      | 5 +++--
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95c5fb0..63d0cd6 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -39,6 +39,7 @@
         "react-native-reanimated": "^3.16.2",
         "react-native-safe-area-context": "4.12.0",
         "react-native-screens": "~4.4.0",
+        "react-native-sse": "^1.2.1",
         "react-native-svg": "^15.11.2",
         "react-redux": "^9.2.0",
         "socket.io-client": "^4.8.1",
@@ -14548,6 +14549,11 @@
         "react-native": "*"
       }
     },
+    "node_modules/react-native-sse": {
+      "version": "1.2.1",
+      "resolved": "https://registry.npmjs.org/react-native-sse/-/react-native-sse-1.2.1.tgz",
+      "integrity": "sha512-zejanlScF+IB9tYnbdry0MT34qjBXbiV/E72qGz33W/tX1bx8MXsbB4lxiuPETc9v/008vYZ60yjIstW22VlVg=="
+    },
     "node_modules/react-native-svg": {
       "version": "15.11.2",
       "resolved": "https://registry.npmjs.org/react-native-svg/-/react-native-svg-15.11.2.tgz",
diff --git a/package.json b/package.json
index 62c765a..32f465f 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
+    "expo-dev-client": "~5.0.20",
     "expo-font": "~13.0.4",
     "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
@@ -48,11 +49,11 @@
     "react-native-reanimated": "^3.16.2",
     "react-native-safe-area-context": "4.12.0",
     "react-native-screens": "~4.4.0",
+    "react-native-sse": "^1.2.1",
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "socket.io-client": "^4.8.1",
-    "tailwindcss": "^3.4.17",
-    "expo-dev-client": "~5.0.20"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",

From 93f8dfa22b8ac792199e9cd27bd005026990b0e4 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 11:02:23 -0400
Subject: [PATCH 250/291] PaymentConfirmation interface to include the orderId

---
 src/screens/CheckoutScreen.tsx      | 27 ++-------------------------
 src/services/paymentConfirmation.ts |  1 +
 src/types/api.d.ts                  |  1 +
 3 files changed, 4 insertions(+), 25 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 3802a1a..6a36ac4 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -49,12 +49,7 @@ import {
   OrderStatus,
   Order as OrderSocketType,
 } from '../hooks/useOrderSocket';
-import {
-  OrderType,
-  CreateOrder,
-  CreateOrderDetail,
-  PaymentMethod,
-} from '@pharmatech/sdk';
+import { OrderType, CreateOrder, CreateOrderDetail } from '@pharmatech/sdk';
 
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -204,24 +199,6 @@ const CheckoutScreen = () => {
 
       setErrorMessage(null);
 
-      let sdkPaymentMethod: PaymentMethod;
-      switch (payment) {
-        case 'efectivo':
-          sdkPaymentMethod = PaymentMethod.CASH;
-          break;
-        case 'punto_de_venta':
-          sdkPaymentMethod = PaymentMethod.CARD;
-          break;
-        case 'transferencia':
-          sdkPaymentMethod = PaymentMethod.BANK_TRANSFER;
-          break;
-        case 'pago_movil':
-          sdkPaymentMethod = PaymentMethod.MOBILE_PAYMENT;
-          break;
-        default:
-          sdkPaymentMethod = PaymentMethod.CASH;
-      }
-
       // Construir el payload de la orden
       const orderPayload: CreateOrder = {
         type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
@@ -229,7 +206,7 @@ const CheckoutScreen = () => {
         userAddressId:
           option === 'delivery' ? locationId || undefined : undefined,
         products,
-        paymentMethod: sdkPaymentMethod,
+        // paymentMethod: sdkPaymentMethod,
       };
 
       try {
diff --git a/src/services/paymentConfirmation.ts b/src/services/paymentConfirmation.ts
index 7a8c33e..de25636 100644
--- a/src/services/paymentConfirmation.ts
+++ b/src/services/paymentConfirmation.ts
@@ -24,6 +24,7 @@ export const PaymentConfirmationService = {
         'phoneNumber',
         'bank',
         'reference',
+        'orderId',
       ];
       for (const field of requiredFields) {
         if (!paymentConfirmation[field]) {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 1cfae9b..2cf6ed0 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -201,6 +201,7 @@ export interface PaymentConfirmation {
   reference: string;
   documentId: string;
   phoneNumber: string;
+  orderId: string;
 }
 
 export interface PaymentConfirmationResponse extends BaseModel {

From 9e3a42a3f6721d7da3970b61507b7e09fde7e131 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 11:23:16 -0400
Subject: [PATCH 251/291] Add payment method handling in CheckoutScreen

---
 package.json                   |  4 ++--
 src/screens/CheckoutScreen.tsx | 35 +++++++++++++++++++++++++++++++---
 2 files changed, 34 insertions(+), 5 deletions(-)

diff --git a/package.json b/package.json
index 6475559..bd58b0d 100644
--- a/package.json
+++ b/package.json
@@ -26,6 +26,7 @@
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
+    "expo-dev-client": "~5.0.20",
     "expo-font": "~13.0.4",
     "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
@@ -51,8 +52,7 @@
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "socket.io-client": "^4.8.1",
-    "tailwindcss": "^3.4.17",
-    "expo-dev-client": "~5.0.20"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 6a36ac4..9da72a2 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -49,7 +49,12 @@ import {
   OrderStatus,
   Order as OrderSocketType,
 } from '../hooks/useOrderSocket';
-import { OrderType, CreateOrder, CreateOrderDetail } from '@pharmatech/sdk';
+import {
+  OrderType,
+  CreateOrder,
+  CreateOrderDetail,
+  PaymentMethod,
+} from '@pharmatech/sdk';
 
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -199,14 +204,38 @@ const CheckoutScreen = () => {
 
       setErrorMessage(null);
 
-      // Construir el payload de la orden
+      let sdkPaymentMethod: PaymentMethod;
+      switch (payment) {
+        case 'efectivo':
+          sdkPaymentMethod = PaymentMethod.CASH;
+          break;
+        case 'punto_de_venta':
+          sdkPaymentMethod = PaymentMethod.CARD;
+          break;
+        case 'transferencia':
+          sdkPaymentMethod = PaymentMethod.BANK_TRANSFER;
+          break;
+        case 'pago_movil':
+          sdkPaymentMethod = PaymentMethod.MOBILE_PAYMENT;
+          break;
+        default:
+          sdkPaymentMethod = PaymentMethod.CASH;
+      }
+
+      // Construir el payload de la orden usando el método seleccionado
       const orderPayload: CreateOrder = {
         type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
         branchId: option === 'pickup' ? locationId || undefined : undefined,
         userAddressId:
           option === 'delivery' ? locationId || undefined : undefined,
         products,
-        // paymentMethod: sdkPaymentMethod,
+        paymentMethod: sdkPaymentMethod,
+        ...(couponApplied && {
+          couponCode:
+            typeof couponDiscount === 'number' && couponDiscount > 0
+              ? 'COUPON'
+              : undefined,
+        }),
       };
 
       try {

From 82411e0d4621fd7790d2343262acac98cd4e16c4 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sat, 24 May 2025 16:44:57 -0400
Subject: [PATCH 252/291] Adding expanded view of maps in delivery flow

---
 src/components/DeliveryMap.tsx                |  26 +--
 src/components/HistoryMap.tsx                 |  16 +-
 src/components/HistoryOrderCard.tsx           |   9 +-
 src/screens/delivery/DeliveryDetailScreen.tsx | 176 +++++++++++++-----
 .../delivery/DeliveryHistoryDetailScreen.tsx  |  94 ++++++++--
 .../delivery/DeliveryHistoryScreen.tsx        |  13 +-
 6 files changed, 235 insertions(+), 99 deletions(-)

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index fa3e7e4..3546f1c 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -1,6 +1,12 @@
 import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
-import { StyleSheet, View, Alert, ActivityIndicator } from 'react-native';
+import {
+  StyleSheet,
+  View,
+  Alert,
+  ActivityIndicator,
+  ViewStyle,
+} from 'react-native';
 import * as Location from 'expo-location';
 import { Config } from '../config';
 import { Colors } from '../styles/theme';
@@ -9,12 +15,14 @@ interface DeliveryMapProps {
   deliveryState: number;
   branchLocation: { latitude: number; longitude: number };
   customerLocation: { latitude: number; longitude: number };
+  style?: ViewStyle; // Permitir estilos personalizados
 }
 
 const DeliveryMap: React.FC<DeliveryMapProps> = ({
   deliveryState,
   branchLocation,
   customerLocation,
+  style, // Recibir el estilo como prop
 }) => {
   const [deliveryLocation, setDeliveryLocation] = useState<{
     latitude: number;
@@ -182,16 +190,16 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   if (isLoading) {
     // Mostrar un indicador de carga mientras se obtienen los datos
     return (
-      <View style={styles.loadingContainer}>
+      <View style={[styles.loadingContainer, style]}>
         <ActivityIndicator size="large" color={Colors.primary} />
       </View>
     );
   }
 
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, style]}>
       <MapView
-        style={styles.map}
+        style={StyleSheet.absoluteFillObject} // Asegura que el mapa ocupe todo el contenedor
         initialRegion={{
           latitude: branchLocation.latitude || 0,
           longitude: branchLocation.longitude || 0,
@@ -251,16 +259,10 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    height: 300,
-    borderRadius: 16,
-    overflow: 'hidden',
-    marginBottom: 16,
-  },
-  map: {
-    flex: 1,
+    flex: 1, // Permitir que el mapa ocupe todo el espacio disponible
   },
   loadingContainer: {
-    height: 300,
+    flex: 1, // Asegura que el indicador de carga ocupe todo el espacio disponible
     justifyContent: 'center',
     alignItems: 'center',
   },
diff --git a/src/components/HistoryMap.tsx b/src/components/HistoryMap.tsx
index 7a0b0d7..ba62402 100644
--- a/src/components/HistoryMap.tsx
+++ b/src/components/HistoryMap.tsx
@@ -1,18 +1,20 @@
 import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
-import { StyleSheet, View, Alert } from 'react-native';
+import { StyleSheet, View, Alert, ViewStyle } from 'react-native';
 import { Config } from '../config';
 
 interface HistoryMapProps {
   deliveryLocation: { latitude: number; longitude: number };
   branchLocation: { latitude: number; longitude: number };
   customerLocation: { latitude: number; longitude: number };
+  style?: ViewStyle; // Permitir estilos personalizados
 }
 
 const HistoryMap: React.FC<HistoryMapProps> = ({
   deliveryLocation,
   branchLocation,
   customerLocation,
+  style, // Recibir el estilo como prop
 }) => {
   const [routeToBranch, setRouteToBranch] = useState<
     { latitude: number; longitude: number }[]
@@ -118,9 +120,9 @@ const HistoryMap: React.FC<HistoryMapProps> = ({
   };
 
   return (
-    <View style={styles.container}>
+    <View style={[styles.container, style]}>
       <MapView
-        style={styles.map}
+        style={StyleSheet.absoluteFillObject} // Asegura que el mapa ocupe todo el contenedor
         initialRegion={{
           latitude: branchLocation.latitude,
           longitude: branchLocation.longitude,
@@ -173,13 +175,7 @@ const HistoryMap: React.FC<HistoryMapProps> = ({
 
 const styles = StyleSheet.create({
   container: {
-    height: 300,
-    borderRadius: 16,
-    overflow: 'hidden',
-    marginBottom: 16,
-  },
-  map: {
-    flex: 1,
+    flex: 1, // Permitir que el mapa ocupe todo el espacio disponible
   },
 });
 
diff --git a/src/components/HistoryOrderCard.tsx b/src/components/HistoryOrderCard.tsx
index e52e37e..e70d09c 100644
--- a/src/components/HistoryOrderCard.tsx
+++ b/src/components/HistoryOrderCard.tsx
@@ -2,7 +2,7 @@ import React from 'react';
 import { View, StyleSheet } from 'react-native';
 import {
   MapPinIcon,
-  ClockIcon,
+  CalendarDaysIcon,
   BuildingStorefrontIcon,
 } from 'react-native-heroicons/outline';
 import { CheckCircleIcon } from 'react-native-heroicons/solid';
@@ -84,9 +84,9 @@ const HistoryOrderCard: React.FC<HistoryOrderCardProps> = ({
           </PoppinsText>
         </View>
         <View style={styles.detailRow}>
-          <ClockIcon size={20} color={Colors.primary} />
+          <CalendarDaysIcon size={20} color={Colors.primary} />
           <PoppinsText style={styles.detailText}>
-            Tiempo de entrega: {estimatedTime}
+            Fecha de entrega: {estimatedTime}
           </PoppinsText>
         </View>
       </View>
@@ -151,6 +151,9 @@ const styles = StyleSheet.create({
     fontSize: FontSizes.b3.size,
     color: Colors.textMain,
     marginLeft: 8,
+    flexWrap: 'wrap', // Permite que el texto se ajuste en varias líneas
+    maxWidth: '90%', // Limita el ancho del texto al 90% del contenedor
+    textAlign: 'left',
   },
   button: {
     marginBottom: 8,
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index ac5d5f5..0e0b25e 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -5,6 +5,8 @@ import {
   ScrollView,
   ActivityIndicator,
   Image,
+  Modal,
+  TouchableOpacity,
 } from 'react-native';
 import { useLocalSearchParams, useRouter } from 'expo-router';
 import {
@@ -12,6 +14,7 @@ import {
   BuildingStorefrontIcon,
   MapPinIcon,
   PhoneIcon,
+  XMarkIcon,
 } from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
 import PoppinsText from '../../components/PoppinsText';
@@ -48,6 +51,43 @@ const DeliveryDetailScreen: React.FC = () => {
   >({});
   const [deliveryStateBadge, setDeliveryStateBadge] = useState(0);
   const router = useRouter();
+  const [isMapModalVisible, setIsMapModalVisible] = useState(false);
+
+  const branchLocation = {
+    latitude: branchNames[orderDetails?.branchId ?? '']?.latitude || 0,
+    longitude: branchNames[orderDetails?.branchId ?? '']?.longitude || 0,
+  };
+
+  const customerLocation = {
+    latitude: orderDetails?.address?.latitude || 0,
+    longitude: orderDetails?.address?.longitude || 0,
+  };
+
+  const deliveryState = useSelector(
+    (state: RootState) => state.delivery.deliveryState[id as string] || 0,
+  );
+
+  // Estados para las alertas
+  const [showAlert, setShowAlert] = useState(false);
+  const [alertType, setAlertType] = useState<'success' | 'error' | 'info'>(
+    'info',
+  );
+  const [alertMessage, setAlertMessage] = useState('');
+
+  const deliveryStates = [
+    'Buscando pedido en sucursal de origen',
+    'Haciendo entrega del pedido',
+  ];
+
+  const buttonStates = [
+    'Comenzar entrega',
+    'Llegué a la sucursal',
+    'Ya tengo los productos del pedido',
+    'Ir a destino de entrega',
+    'Ya hice la entrega',
+  ];
+
+  const [showConfirmationPopup, setShowConfirmationPopup] = useState(false);
 
   useEffect(() => {
     const fetchOrderDetails = async () => {
@@ -143,41 +183,21 @@ const DeliveryDetailScreen: React.FC = () => {
     fetchOrder();
   }, [orderDetails]);
 
-  const deliveryState = useSelector(
-    (state: RootState) => state.delivery.deliveryState[id as string] || 0,
-  );
-
-  // Estados para las alertas
-  const [showAlert, setShowAlert] = useState(false);
-  const [alertType, setAlertType] = useState<'success' | 'error' | 'info'>(
-    'info',
-  );
-  const [alertMessage, setAlertMessage] = useState('');
-
-  const deliveryStates = [
-    'Buscando pedido en sucursal de origen',
-    'Haciendo entrega del pedido',
-  ];
-
-  const buttonStates = [
-    'Comenzar entrega',
-    'Llegué a la sucursal',
-    'Ya tengo los productos del pedido',
-    'Ir a destino de entrega',
-    'Ya hice la entrega',
-  ];
-
-  const [showConfirmationPopup, setShowConfirmationPopup] = useState(false);
-
-  const branchLocation = {
-    latitude: branchNames[orderDetails?.branchId ?? '']?.latitude || 0,
-    longitude: branchNames[orderDetails?.branchId ?? '']?.longitude || 0,
-  };
+  // Mostrar un indicador de carga mientras se obtienen los detalles del pedido o la orden
+  if (isOrderDetailsLoading || isFetchingOrder) {
+    return <ActivityIndicator size="large" color={Colors.primary} />;
+  }
 
-  const customerLocation = {
-    latitude: orderDetails?.address?.latitude || 0,
-    longitude: orderDetails?.address?.longitude || 0,
-  };
+  if (!orderDetails) {
+    // Mostrar un mensaje de error si no se encuentran los detalles del pedido
+    return (
+      <View style={styles.errorContainer}>
+        <PoppinsText style={styles.errorText}>
+          No se encontraron datos del pedido.
+        </PoppinsText>
+      </View>
+    );
+  }
 
   const handleNextState = async () => {
     try {
@@ -267,22 +287,6 @@ const DeliveryDetailScreen: React.FC = () => {
     }
   };
 
-  if (isOrderDetailsLoading || isFetchingOrder) {
-    // Mostrar un indicador de carga mientras se obtienen los detalles del pedido o la orden
-    return <ActivityIndicator size="large" color={Colors.primary} />;
-  }
-
-  if (!orderDetails) {
-    // Mostrar un mensaje de error si no se encuentran los detalles del pedido
-    return (
-      <View style={styles.errorContainer}>
-        <PoppinsText style={styles.errorText}>
-          No se encontraron datos del pedido.
-        </PoppinsText>
-      </View>
-    );
-  }
-
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       {/* Mostrar alertas */}
@@ -407,6 +411,15 @@ const DeliveryDetailScreen: React.FC = () => {
           deliveryState={deliveryState}
           branchLocation={branchLocation}
           customerLocation={customerLocation}
+          style={{ height: 300, marginBottom: 16 }}
+        />
+
+        <Button
+          title={'Ver mapa ampliado'}
+          variant="primary"
+          size="medium"
+          onPress={() => setIsMapModalVisible(true)}
+          style={styles.expandButton}
         />
 
         {/* Pedido (contenido comentado) */}
@@ -485,6 +498,40 @@ const DeliveryDetailScreen: React.FC = () => {
         }}
         onClose={() => setShowConfirmationPopup(false)}
       />
+
+      {/* Modal para el mapa ampliado */}
+      <Modal
+        visible={isMapModalVisible}
+        animationType="slide"
+        transparent={true} // Hacer el modal transparente para superponer el contenido
+        onRequestClose={() => setIsMapModalVisible(false)}
+      >
+        <View style={styles.modalContainer}>
+          {/* Botón de cierre */}
+          <TouchableOpacity
+            style={styles.closeButton}
+            onPress={() => setIsMapModalVisible(false)}
+          >
+            <XMarkIcon size={24} color={Colors.textMain} />
+          </TouchableOpacity>
+
+          {/* Mapa ampliado */}
+          <DeliveryMap
+            deliveryState={deliveryState}
+            branchLocation={branchLocation}
+            customerLocation={customerLocation}
+          />
+
+          {/* Botón flotante sobre el modal */}
+          <Button
+            title={buttonStates[deliveryState]}
+            variant="primary"
+            size="medium"
+            onPress={handleNextState}
+            style={[styles.floatingButton, styles.modalFloatingButton]}
+          />
+        </View>
+      </Modal>
     </View>
   );
 };
@@ -674,6 +721,35 @@ const styles = StyleSheet.create({
     top: 20,
     zIndex: 1000,
   },
+  expandButton: {
+    marginBottom: 12,
+  },
+  modalContainer: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  closeButton: {
+    position: 'absolute',
+    top: 16,
+    right: 16,
+    zIndex: 10,
+    backgroundColor: Colors.textWhite,
+    padding: 8,
+    borderRadius: 16,
+  },
+  fullScreenMapContainer: {
+    flex: 1,
+    justifyContent: 'center',
+    alignItems: 'center',
+    marginBottom: 16,
+  },
+  modalFloatingButton: {
+    position: 'absolute',
+    bottom: 16,
+    left: 16,
+    right: 16,
+    zIndex: 10,
+  },
 });
 
 export default DeliveryDetailScreen;
diff --git a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
index 1d1b4c3..8dca6d3 100644
--- a/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryDetailScreen.tsx
@@ -5,9 +5,15 @@ import {
   ScrollView,
   ActivityIndicator,
   Image,
+  Modal,
+  TouchableOpacity,
 } from 'react-native';
 import { useLocalSearchParams } from 'expo-router';
-import { PhoneIcon, EnvelopeIcon } from 'react-native-heroicons/solid';
+import {
+  PhoneIcon,
+  EnvelopeIcon,
+  XMarkIcon,
+} from 'react-native-heroicons/solid';
 import Badge from '../../components/Badge';
 import PoppinsText from '../../components/PoppinsText';
 import CustomerAvatar from '../../components/CustomerAvatar';
@@ -21,6 +27,7 @@ import {
   OrderDetailedResponse,
 } from '@pharmatech/sdk';
 import { UserService } from '../../services/user';
+import Button from '../../components/Button';
 
 const DeliveryHistoryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
@@ -31,6 +38,8 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
   );
   const [loading, setLoading] = useState(true);
 
+  const [isMapModalVisible, setIsMapModalVisible] = useState(false);
+
   const [order, setOrder] = useState<OrderDetailedResponse | undefined>(
     undefined,
   );
@@ -111,19 +120,6 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
       minute: '2-digit',
     },
   );
-  const creationTime = new Date(orderDetails.createdAt).toLocaleTimeString(
-    'es-VE',
-    {
-      hour: '2-digit',
-      minute: '2-digit',
-    },
-  );
-  const creationTimePlusOneHour = new Date(
-    new Date(orderDetails.createdAt).getTime() + 60 * 43 * 1000,
-  ).toLocaleTimeString('es-VE', {
-    hour: '2-digit',
-    minute: '2-digit',
-  });
 
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
@@ -211,23 +207,22 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
           </View>
         </View>
 
+        {/* Historial de la entrega 
+
         <PoppinsText weight="medium" style={styles.sectionTitle}>
           Historial de la entrega
         </PoppinsText>
 
         <View style={styles.combinedCardHistory}>
-          {/* Contenedor de la información de la sucursal */}
+
           <View style={styles.info}>
-            {/* Línea vertical punteada */}
+          
             <View style={styles.verticalLineHistory} />
 
-            {/* Línea vertical punteada */}
             <View style={styles.circleTopHistory} />
 
-            {/* Círculo middle */}
             <View style={styles.circleMiddleHistory} />
 
-            {/* Círculo inferior */}
             <View style={styles.circleBottomHistory} />
 
             <View style={styles.sectionContainer}>
@@ -261,7 +256,7 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
               </PoppinsText>
             </View>
           </View>
-        </View>
+        </View>*/}
 
         {/* Recorrido de entrega */}
         <PoppinsText weight="medium" style={styles.sectionTitle}>
@@ -280,6 +275,15 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
             latitude: orderDetails.address.latitude,
             longitude: orderDetails.address.longitude,
           }}
+          style={{ marginBottom: 16, height: 300 }}
+        />
+
+        <Button
+          title={'Ver mapa ampliado'}
+          variant="primary"
+          size="medium"
+          onPress={() => setIsMapModalVisible(true)}
+          style={styles.expandButton}
         />
 
         {/* Pedido */}
@@ -334,6 +338,40 @@ const DeliveryHistoryDetailScreen: React.FC = () => {
 
         <View style={styles.scrollSpacer} />
       </ScrollView>
+
+      {/* Modal para el mapa ampliado */}
+      <Modal
+        visible={isMapModalVisible}
+        animationType="slide"
+        transparent={true} // Hacer el modal transparente para superponer el contenido
+        onRequestClose={() => setIsMapModalVisible(false)}
+      >
+        <View style={styles.modalContainer}>
+          {/* Botón de cierre */}
+          <TouchableOpacity
+            style={styles.closeButton}
+            onPress={() => setIsMapModalVisible(false)}
+          >
+            <XMarkIcon size={24} color={Colors.textMain} />
+          </TouchableOpacity>
+
+          {/* Mapa ampliado */}
+          <HistoryMap
+            deliveryLocation={{
+              latitude: 10.068522,
+              longitude: -69.282318,
+            }}
+            branchLocation={{
+              latitude: branchDetails.latitude,
+              longitude: branchDetails.longitude,
+            }}
+            customerLocation={{
+              latitude: orderDetails.address.latitude,
+              longitude: orderDetails.address.longitude,
+            }}
+          />
+        </View>
+      </Modal>
     </View>
   );
 };
@@ -610,6 +648,22 @@ const styles = StyleSheet.create({
   scrollSpacer: {
     height: 64,
   },
+  expandButton: {
+    marginBottom: 12,
+  },
+  modalContainer: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  closeButton: {
+    position: 'absolute',
+    top: 16,
+    right: 16,
+    zIndex: 10,
+    backgroundColor: Colors.textWhite,
+    padding: 8,
+    borderRadius: 16,
+  },
 });
 
 export default DeliveryHistoryDetailScreen;
diff --git a/src/screens/delivery/DeliveryHistoryScreen.tsx b/src/screens/delivery/DeliveryHistoryScreen.tsx
index 95dea26..5112bc5 100644
--- a/src/screens/delivery/DeliveryHistoryScreen.tsx
+++ b/src/screens/delivery/DeliveryHistoryScreen.tsx
@@ -119,10 +119,15 @@ const DeliveryHistoryScreen: React.FC = () => {
               orderType="pedido"
               address={order.address?.adress || 'Dirección no disponible'}
               branch={branchNames[order.branchId] || 'Sucursal no disponible'}
-              estimatedTime={calculateElapsedTime(
-                order.createdAt,
-                order.updatedAt,
-              )} // Tiempo transcurrido entre creación y última actualización
+              estimatedTime={new Date(order.updatedAt).toLocaleDateString(
+                'es-VE',
+                {
+                  weekday: 'long',
+                  year: 'numeric',
+                  month: 'long',
+                  day: 'numeric',
+                },
+              )} // Fecha de la última actualización
               elapsedTime={calculateElapsedTime(order.createdAt)}
               completionTime={new Date(order.updatedAt).toLocaleTimeString(
                 'es-VE',

From f1ed70ac8e9d501b56bfded8ab3e02f2b5d11c67 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 17:33:51 -0400
Subject: [PATCH 253/291] Add InProgressOrder screen and update Checkout flow
 for order tracking

---
 src/app/_layout.tsx                   |   9 +
 src/app/in-progress-order.tsx         |   3 +
 src/components/PaymentInfoForm.tsx    |  22 +-
 src/screens/CheckoutScreen.tsx        | 284 ++++++++------------------
 src/screens/InProgressOrderScreen.tsx | 238 +++++++++++++++++++++
 5 files changed, 347 insertions(+), 209 deletions(-)
 create mode 100644 src/app/in-progress-order.tsx
 create mode 100644 src/screens/InProgressOrderScreen.tsx

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 82ff0d8..4cfffd9 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -179,6 +179,15 @@ export default function RootLayout() {
               headerShown: false,
             }}
           />
+          <Stack.Screen
+            name="in-progress-order"
+            options={{
+              headerTitle: '',
+              headerTransparent: true,
+              headerLeft: undefined,
+              headerShown: false,
+            }}
+          />
           <Stack.Screen
             name="active-orders"
             options={{
diff --git a/src/app/in-progress-order.tsx b/src/app/in-progress-order.tsx
new file mode 100644
index 0000000..746011c
--- /dev/null
+++ b/src/app/in-progress-order.tsx
@@ -0,0 +1,3 @@
+import InProgressOrderScreen from '../screens/InProgressOrderScreen';
+
+export default InProgressOrderScreen;
diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index 2b20240..e8b9b73 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -7,12 +7,7 @@ import Dropdown from './Dropdown';
 import { PharmaTech } from '@pharmatech/sdk';
 
 interface Props {
-  paymentMethod:
-    | 'punto_de_venta'
-    | 'efectivo'
-    | 'transferencia'
-    | 'pago_movil'
-    | null;
+  paymentMethod: 'CARD' | 'CASH' | 'BANK_TRANSFER' | 'MOBILE_PAYMENT' | null;
   total: string;
   onValidationChange: (isValid: boolean) => void;
   onBankChange: (value: string) => void;
@@ -90,14 +85,14 @@ const PaymentInfoForm: React.FC<Props> = ({
   useEffect(() => {
     const isValid =
       paymentMethod !== null &&
-      (paymentMethod === 'pago_movil' || paymentMethod === 'transferencia')
+      (paymentMethod === 'MOBILE_PAYMENT' || paymentMethod === 'BANK_TRANSFER')
         ? bank.trim() !== '' &&
           /^\d{4,}$/.test(reference) &&
           reference.trim() !== '' &&
-          !/^0+$/.test(reference) && // no solo ceros
+          !/^0+$/.test(reference) &&
           /^\d{7,8}$/.test(documentNumber) &&
-          !/^0+$/.test(documentNumber) && // no solo ceros
-          !/^0/.test(documentNumber) && // no inicia en 0
+          !/^0+$/.test(documentNumber) &&
+          !/^0/.test(documentNumber) &&
           /^\d{11}$/.test(phone)
         : true;
 
@@ -132,8 +127,8 @@ const PaymentInfoForm: React.FC<Props> = ({
 
   return (
     <View style={styles.container}>
-      {(paymentMethod === 'pago_movil' ||
-        paymentMethod === 'transferencia') && (
+      {(paymentMethod === 'MOBILE_PAYMENT' ||
+        paymentMethod === 'BANK_TRANSFER') && (
         <>
           <PoppinsText style={styles.label}>
             Realiza el pago en la siguiente cuenta de Pharmatech
@@ -158,7 +153,7 @@ const PaymentInfoForm: React.FC<Props> = ({
 
           <View style={styles.row}>
             <View style={[styles.inputWrapper, styles.largeInput]}>
-              {paymentMethod === 'pago_movil' ? (
+              {paymentMethod === 'MOBILE_PAYMENT' ? (
                 <Input
                   label="Teléfono"
                   value="0414-1234567"
@@ -250,6 +245,7 @@ const PaymentInfoForm: React.FC<Props> = ({
           />
         </>
       )}
+      {/* Si se requiere mostrar algo para CASH o CARD, agregar aquí */}
     </View>
   );
 };
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 9da72a2..42e3dcf 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -21,9 +21,7 @@ import Steps from '../components/Steps';
 import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
 import LocationSelector from '../components/LocationSelector';
-import PaymentInfoForm from '../components/PaymentInfoForm';
 import Coupon from '../components/Coupon';
-import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
 import { UserService } from '../services/user';
@@ -39,16 +37,13 @@ import {
   setOption,
   setPayment,
   setLocationId,
-  setPaymentInfoValid,
-  resetCheckout,
   setCouponDiscount,
   setCouponApplied,
 } from '../redux/slices/checkoutSlice';
-import {
-  useOrderSocket,
-  OrderStatus,
-  Order as OrderSocketType,
-} from '../hooks/useOrderSocket';
+import {} from // useOrderSocket, // commented: unused
+// OrderStatus, // commented: unused
+// Order as OrderSocketType, // commented: unused
+'../hooks/useOrderSocket';
 import {
   OrderType,
   CreateOrder,
@@ -71,17 +66,14 @@ const CheckoutScreen = () => {
     latitude: number;
     longitude: number;
   } | null>(null);
-  const [orderNumber, setOrderNumber] = useState<string | null>(null);
+  // const [orderNumber, setOrderNumber] = useState<string | null>(null); // commented: unused
   const [popupVisible, setPopupVisible] = useState(false);
   const [popupMessages, setPopupMessages] = useState<string[]>([]);
   const [validationPopupVisible, setValidationPopupVisible] = useState(false);
   const [emailVerificationModalVisible, setEmailVerificationModalVisible] =
     useState(false); // Track modal visibility
-  const [orderStatus, setOrderStatus] = useState<string | null>(null);
+  // const [orderStatus, setOrderStatus] = useState<string | null>(null); // commented: unused
   // Suscribe al socket usando el hook; solo se conecta cuando orderNumber no es null
-  useOrderSocket(orderNumber, (updatedOrder: OrderSocketType) => {
-    setOrderStatus(updatedOrder.status);
-  });
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -120,13 +112,8 @@ const CheckoutScreen = () => {
     }, [step]),
   );
 
-  const isSimplifiedSteps =
-    (option === 'pickup' && payment === 'punto_de_venta') ||
-    (option === 'delivery' && payment === 'efectivo');
-
-  const stepsLabels = isSimplifiedSteps
-    ? ['Opciones de Compra', 'Confirmación de orden']
-    : ['Opciones de Compra', 'Visualización de datos', 'Confirmación de orden'];
+  // Solo mostrar el paso 1
+  const stepsLabels = ['Opciones de Compra'];
 
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
@@ -154,16 +141,16 @@ const CheckoutScreen = () => {
     return null;
   };
 
-  const isValidUUID = (value: string | null): boolean => {
-    const uuidRegex =
-      /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    return value !== null && uuidRegex.test(value);
-  };
+  // const isValidUUID = (value: string | null): boolean => {
+  //   const uuidRegex =
+  //     /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  //   return value !== null && uuidRegex.test(value);
+  // };
 
   const handleContinue = async () => {
     const missingFields: string[] = [];
 
-    // Validación para el paso 1
+    // Validación solo para el paso 1
     if (step === 1) {
       if (!option) missingFields.push('Seleccionar una opción de compra.');
       if (!locationId)
@@ -184,24 +171,6 @@ const CheckoutScreen = () => {
           quantity: item.quantity,
         }));
 
-      if (products.length === 0) {
-        setErrorMessage('No hay productos válidos en el carrito.');
-        setOrderStatus(null);
-        return;
-      }
-
-      // Validar locationId según opción
-      if (option === 'pickup' && !isValidUUID(locationId)) {
-        setErrorMessage('La sucursal seleccionada no es válida.');
-        setOrderStatus(null);
-        return;
-      }
-      if (option === 'delivery' && !isValidUUID(locationId)) {
-        setErrorMessage('La dirección seleccionada no es válida.');
-        setOrderStatus(null);
-        return;
-      }
-
       setErrorMessage(null);
 
       let sdkPaymentMethod: PaymentMethod;
@@ -246,32 +215,27 @@ const CheckoutScreen = () => {
           setErrorMessage(
             'No pudimos procesar tu orden. Inténtalo nuevamente.',
           );
-          setOrderStatus(null);
-          return;
         }
 
-        setOrderNumber(orderResponse.id);
-        setOrderStatus(orderResponse.status);
-
-        // Ir siempre a la confirmación de orden, sin importar el tipo de orden
-        dispatch(setStep(stepsLabels.length));
+        // Redirigir a la pantalla de orden en progreso (step 2 y 3)
+        router.push({
+          pathname: '/in-progress-order',
+          params: {
+            paymentMethod: orderPayload.paymentMethod,
+            orderStatus: orderResponse.status,
+            orderNumber: orderResponse.id,
+            orderType: orderPayload.type,
+            totalPrice: orderResponse.totalPrice,
+            userName,
+            step: 2, // <-- Indica que ya se cumplió "Opciones de Compra"
+          },
+        });
       } catch (error) {
         console.error('Error al procesar la orden:', error);
         setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
-        setOrderStatus(null);
       }
       return;
     }
-
-    // Paso de confirmación (último paso)
-    if (step === stepsLabels.length) {
-      dispatch(clearCart());
-      dispatch(resetCheckout());
-      router.dismissAll();
-      router.replace({
-        pathname: '/(tabs)',
-      });
-    }
   };
 
   const handleGoBack = () => {
@@ -295,15 +259,15 @@ const CheckoutScreen = () => {
   //}
   // };
 
-  const renderConfirmationContent = (status: OrderStatus | null) => {
-    if (status === 'approved' && option === 'pickup') {
-      return <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>;
-    }
-    if (status === 'approved' && option === 'delivery') {
-      return <PoppinsText>Tu pedido está en camino.</PoppinsText>;
-    }
-    return null;
-  };
+  // const renderConfirmationContent = (status: OrderStatus | null) => {
+  //   if (status === 'approved' && option === 'pickup') {
+  //     return <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>;
+  //   }
+  //   if (status === 'approved' && option === 'delivery') {
+  //     return <PoppinsText>Tu pedido está en camino.</PoppinsText>;
+  //   }
+  //   return null;
+  // };
 
   const handleApplyCoupon = (discountAmount: number) => {
     dispatch(setCouponDiscount(discountAmount));
@@ -337,12 +301,10 @@ const CheckoutScreen = () => {
       />
       <ScrollView contentContainerStyle={styles.scrollContainer}>
         <View style={styles.container}>
-          {step < stepsLabels.length && (
-            <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-              <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
-            </TouchableOpacity>
-          )}
-
+          {/* Solo mostrar el step 1 */}
+          <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
+            <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
+          </TouchableOpacity>
           <View style={styles.steps}>
             <Animated.View style={{ opacity: 1 }}>
               <Steps
@@ -352,125 +314,61 @@ const CheckoutScreen = () => {
               />
             </Animated.View>
           </View>
-
           {errorMessage && (
             <PoppinsText style={styles.errorMessage}>
               {errorMessage}
             </PoppinsText>
           )}
-
-          {step === 1 && (
-            <>
-              <PoppinsText style={styles.purchaseOptionsTitle}>
-                Opciones de Compra
-              </PoppinsText>
-              <View style={styles.radioContainer}>
-                <View style={styles.radioItem}>
-                  <RadioCard
-                    label="Retiro en Sucursal"
-                    icon={<ShoppingBagIcon color={Colors.textMain} />}
-                    selected={option === 'pickup'}
-                    onPress={() => {
-                      dispatch(setOption('pickup'));
-                      dispatch(setLocationId(null));
-                    }}
-                  />
-                </View>
-                <View>
-                  <RadioCard
-                    label="Delivery"
-                    icon={<TruckIcon color={Colors.textMain} />}
-                    selected={option === 'delivery'}
-                    onPress={() => {
-                      dispatch(setOption('delivery'));
-                      dispatch(setLocationId(null));
-                    }}
-                  />
-                </View>
-              </View>
-              <LocationSelector
-                selectedOption={option || 'pickup'}
-                onSelect={(val) => dispatch(setLocationId(val))}
-                setSelectedBranch={setSelectedBranch}
+          {/* Solo el paso 1 */}
+          <PoppinsText style={styles.purchaseOptionsTitle}>
+            Opciones de Compra
+          </PoppinsText>
+          <View style={styles.radioContainer}>
+            <View style={styles.radioItem}>
+              <RadioCard
+                label="Retiro en Sucursal"
+                icon={<ShoppingBagIcon color={Colors.textMain} />}
+                selected={option === 'pickup'}
+                onPress={() => {
+                  dispatch(setOption('pickup'));
+                  dispatch(setLocationId(null));
+                }}
               />
-              {/*               <Button
-                title="Ver Ubicación en el Mapa"
-                size="small"
-                style={styles.secondaryButton}
-                variant="secondary"
-                icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
-                onPress={handleOpenMapModal}
-              /> */}
-
-              <View style={styles.paymentMethods}>
-                <PaymentMethods
-                  selectedOption={option}
-                  selectedPayment={payment}
-                  setSelectedPayment={(val) => dispatch(setPayment(val))}
-                />
-              </View>
-              {renderFooterMessage() && (
-                <PoppinsText style={styles.footerMessage}>
-                  {renderFooterMessage()}
-                </PoppinsText>
-              )}
-            </>
-          )}
-
-          {step === 2 && !isSimplifiedSteps && (
-            <>
-              <PoppinsText
-                style={[styles.purchaseOptionsTitle, styles.step2Title]}
-              >
-                Visualización de datos
-              </PoppinsText>
-              <View style={styles.paymentInfoFormContainer}>
-                <PaymentInfoForm
-                  paymentMethod={payment}
-                  total={total.toFixed(2)}
-                  onValidationChange={(isValid) =>
-                    dispatch(setPaymentInfoValid(isValid))
-                  }
-                  onBankChange={(value) => console.log('Bank changed:', value)}
-                  onReferenceChange={(value) =>
-                    console.log('Reference changed:', value)
-                  }
-                  onDocumentNumberChange={(value) =>
-                    console.log('Document number changed:', value)
-                  }
-                  onPhoneChange={(value) =>
-                    console.log('Phone changed:', value)
-                  }
-                />
-              </View>
-            </>
-          )}
-
-          {step === stepsLabels.length && (
-            <>
-              <PoppinsText style={styles.purchaseOptionsTitle}>
-                Confirmación de Orden
-              </PoppinsText>
-              {orderStatus ? (
-                <PaymentStatusMessage
-                  orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
-                  userName={userName || 'Usuario'}
-                  orderStatus={orderStatus as OrderStatus}
-                />
-              ) : null}
-              <View style={styles.confirmationContainer}>
-                {renderConfirmationContent(orderStatus as OrderStatus | null)}
-              </View>
-            </>
+            </View>
+            <View>
+              <RadioCard
+                label="Delivery"
+                icon={<TruckIcon color={Colors.textMain} />}
+                selected={option === 'delivery'}
+                onPress={() => {
+                  dispatch(setOption('delivery'));
+                  dispatch(setLocationId(null));
+                }}
+              />
+            </View>
+          </View>
+          <LocationSelector
+            selectedOption={option || 'pickup'}
+            onSelect={(val) => dispatch(setLocationId(val))}
+            setSelectedBranch={setSelectedBranch}
+          />
+          <View style={styles.paymentMethods}>
+            <PaymentMethods
+              selectedOption={option}
+              selectedPayment={payment}
+              setSelectedPayment={(val) => dispatch(setPayment(val))}
+            />
+          </View>
+          {renderFooterMessage() && (
+            <PoppinsText style={styles.footerMessage}>
+              {renderFooterMessage()}
+            </PoppinsText>
           )}
-
           <View style={styles.whiteBackgroundContainer}>
-            {step !== 2 && step < stepsLabels.length && (
-              <Coupon
-                onApplyCoupon={handleApplyCoupon}
-                onCouponApplied={() => dispatch(setCouponApplied(true))}
-              />
-            )}
+            <Coupon
+              onApplyCoupon={handleApplyCoupon}
+              onCouponApplied={() => dispatch(setCouponApplied(true))}
+            />
             <OrderSummary />
             <View style={styles.totalContainer}>
               {couponApplied && (
@@ -494,13 +392,7 @@ const CheckoutScreen = () => {
               </View>
             </View>
             <Button
-              title={
-                step === 1
-                  ? 'Realizar Pago'
-                  : step < stepsLabels.length
-                    ? 'Continuar'
-                    : 'Volver al Home'
-              }
+              title="Realizar Pago"
               size="medium"
               style={styles.checkoutButton}
               variant={'primary'}
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
new file mode 100644
index 0000000..400ee6a
--- /dev/null
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -0,0 +1,238 @@
+import React, { useState, useEffect } from 'react';
+import { View, StyleSheet, ScrollView } from 'react-native';
+import PaymentStatusMessage from '../components/PaymentStatusMessage';
+import PaymentInfoForm from '../components/PaymentInfoForm';
+import OrderSummary from '../components/OrderSummary';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { useLocalSearchParams } from 'expo-router';
+import { UserService } from '../services/user';
+import Steps from '../components/Steps';
+import Button from '../components/Button';
+import { truncateString } from '../utils/commons';
+import { OrderStatus } from '../hooks/useOrderSocket';
+
+const stepsLabels = [
+  'Opciones de Compra',
+  'Visualización de datos',
+  'Confirmación de orden',
+];
+
+const InProgressOrderScreen = () => {
+  const {
+    paymentMethod,
+    orderStatus,
+    orderNumber,
+    orderType,
+    totalPrice,
+    userName: initialUserName,
+    step: initialStep,
+  } = useLocalSearchParams();
+
+  const [step, setStep] = useState(initialStep ? Number(initialStep) : 1);
+  const [userName, setUserName] = useState<string | null>(
+    (initialUserName as string) || 'Usuario',
+  );
+
+  useEffect(() => {
+    const fetchUserName = async () => {
+      const response = await UserService.getProfile();
+      if (response.success && response.data) {
+        setUserName(response.data.firstName);
+      }
+    };
+    fetchUserName();
+  }, []);
+
+  // Normaliza el método de pago recibido
+  function normalizePaymentMethod(
+    method: unknown,
+  ): 'CARD' | 'CASH' | 'BANK_TRANSFER' | 'MOBILE_PAYMENT' | null {
+    if (!method) return null;
+    const value = Array.isArray(method) ? method[0] : method;
+    switch ((value as string)?.toUpperCase?.()) {
+      case 'CARD':
+        return 'CARD';
+      case 'CASH':
+        return 'CASH';
+      case 'BANK_TRANSFER':
+        return 'BANK_TRANSFER';
+      case 'MOBILE_PAYMENT':
+        return 'MOBILE_PAYMENT';
+      default:
+        return null;
+    }
+  }
+
+  return (
+    <ScrollView contentContainerStyle={styles.scrollContainer}>
+      <View style={styles.container}>
+        <View style={styles.steps}>
+          <Steps
+            totalSteps={stepsLabels.length}
+            currentStep={step}
+            labels={stepsLabels}
+          />
+        </View>
+        {step === 1 && (
+          <>
+            <PoppinsText style={styles.purchaseOptionsTitle}>
+              Opciones de Compra
+            </PoppinsText>
+          </>
+        )}
+        {step === 2 && (
+          <>
+            <PoppinsText style={styles.purchaseOptionsTitle}>
+              Visualización de datos
+            </PoppinsText>
+            <View style={styles.whiteBackgroundContainer}>
+              <View style={styles.paymentInfoFormContainer}>
+                <PaymentInfoForm
+                  paymentMethod={normalizePaymentMethod(paymentMethod)}
+                  total={totalPrice ? String(totalPrice) : ''}
+                  onValidationChange={() => {}}
+                  onBankChange={() => {}}
+                  onReferenceChange={() => {}}
+                  onDocumentNumberChange={() => {}}
+                  onPhoneChange={() => {}}
+                />
+              </View>
+              <OrderSummary />
+              <View style={styles.totalContainer}>
+                <View style={styles.totalRow}>
+                  <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+                  <PoppinsText style={styles.totalAmount}>
+                    ${totalPrice ? totalPrice : ''}
+                  </PoppinsText>
+                </View>
+              </View>
+              <View style={styles.buttonContainer}>
+                <Button
+                  title="Confirmar Orden"
+                  size="medium"
+                  style={styles.nextButton}
+                  variant="primary"
+                  onPress={() => setStep(3)}
+                />
+              </View>
+            </View>
+          </>
+        )}
+        {step === 3 && (
+          <>
+            <PoppinsText style={styles.purchaseOptionsTitle}>
+              Confirmacion de la orden
+            </PoppinsText>
+            <PaymentStatusMessage
+              orderStatus={orderStatus as OrderStatus}
+              orderNumber={truncateString(orderNumber as string, 8, '')}
+              userName={userName || ''}
+            />
+            <View style={styles.whiteBackgroundContainer}>
+              <View style={styles.confirmationContainer}>
+                {/* Show additional confirmation message based on status and type */}
+                {orderStatus === 'approved' && orderType === 'pickup' && (
+                  <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>
+                )}
+                {orderStatus === 'approved' && orderType === 'delivery' && (
+                  <PoppinsText>Tu pedido está en camino.</PoppinsText>
+                )}
+              </View>
+              <OrderSummary />
+              <View style={styles.totalContainer}>
+                <View style={styles.totalRow}>
+                  <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+                  <PoppinsText style={styles.totalAmount}>
+                    ${totalPrice ? totalPrice : ''}
+                  </PoppinsText>
+                </View>
+              </View>
+            </View>
+          </>
+        )}
+      </View>
+    </ScrollView>
+  );
+};
+
+const styles = StyleSheet.create({
+  scrollContainer: {
+    flexGrow: 1,
+  },
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  steps: {
+    marginTop: 30,
+    marginBottom: 20,
+    padding: 20,
+  },
+  stepLabel: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    alignSelf: 'flex-start',
+    paddingVertical: 8,
+  },
+  purchaseOptionsTitle: {
+    paddingVertical: 16,
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    marginBottom: 30,
+    alignSelf: 'flex-start',
+    padding: 20,
+  },
+  confirmationContainer: {
+    marginTop: 20,
+    alignItems: 'center',
+    paddingHorizontal: 20,
+  },
+  buttonContainer: {
+    marginTop: 20,
+    alignItems: 'flex-end',
+  },
+  nextButton: {
+    color: Colors.primary,
+    fontSize: FontSizes.h5.size,
+    fontWeight: 'bold',
+    padding: 10,
+    width: '100%',
+    height: 50,
+    marginTop: 15,
+    marginBottom: 16,
+  },
+  whiteBackgroundContainer: {
+    backgroundColor: '#FFFFFF',
+    padding: 20,
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    marginTop: 20,
+  },
+  paymentInfoFormContainer: {
+    paddingHorizontal: 20,
+    paddingTop: 0,
+  },
+  totalContainer: {
+    width: '100%',
+    marginBottom: 10,
+  },
+  totalRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    width: '100%',
+  },
+  totalLabel: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
+  totalAmount: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.primary,
+  },
+});
+
+export default InProgressOrderScreen;

From 773121de3a31cd59133166f6ea52e59b2d15bd1e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 18:44:26 -0400
Subject: [PATCH 254/291] Refactor Checkout and InProgressOrder screens to
 streamline order handling and improve data fetching

---
 src/screens/CheckoutScreen.tsx        |  31 +----
 src/screens/InProgressOrderScreen.tsx | 158 ++++++++++++++------------
 2 files changed, 89 insertions(+), 100 deletions(-)

diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 42e3dcf..c15eb2b 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import {
   View,
   StyleSheet,
@@ -24,7 +24,6 @@ import LocationSelector from '../components/LocationSelector';
 import Coupon from '../components/Coupon';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
-import { UserService } from '../services/user';
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
@@ -59,7 +58,7 @@ const CheckoutScreen = () => {
   const router = useRouter();
   const { cartItems } = useCart();
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [userName, setUserName] = useState<string | null>('Usuario');
+  //const [userName, setUserName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<{
     name: string;
@@ -75,26 +74,6 @@ const CheckoutScreen = () => {
   // const [orderStatus, setOrderStatus] = useState<string | null>(null); // commented: unused
   // Suscribe al socket usando el hook; solo se conecta cuando orderNumber no es null
 
-  useEffect(() => {
-    const fetchUserName = async () => {
-      const response = await UserService.getProfile();
-      if (response.success && response.data) {
-        const { firstName, isValidated } = response.data;
-        setUserName(firstName);
-        if (!isValidated) {
-          setValidationPopupVisible(true);
-        }
-      } else if (!response.success) {
-        console.error(
-          'Error al obtener el nombre del usuario:',
-          response.error,
-        );
-      }
-    };
-
-    fetchUserName();
-  }, []);
-
   useFocusEffect(
     React.useCallback(() => {
       const onBackPress = () => {
@@ -221,13 +200,7 @@ const CheckoutScreen = () => {
         router.push({
           pathname: '/in-progress-order',
           params: {
-            paymentMethod: orderPayload.paymentMethod,
-            orderStatus: orderResponse.status,
             orderNumber: orderResponse.id,
-            orderType: orderPayload.type,
-            totalPrice: orderResponse.totalPrice,
-            userName,
-            step: 2, // <-- Indica que ya se cumplió "Opciones de Compra"
           },
         });
       } catch (error) {
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 400ee6a..b155a1c 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -10,7 +10,12 @@ import { UserService } from '../services/user';
 import Steps from '../components/Steps';
 import Button from '../components/Button';
 import { truncateString } from '../utils/commons';
-import { OrderStatus } from '../hooks/useOrderSocket';
+import {
+  OrderStatus,
+  OrderDetailedResponse,
+  PharmaTech,
+} from '@pharmatech/sdk';
+import * as SecureStore from 'expo-secure-store';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -19,20 +24,11 @@ const stepsLabels = [
 ];
 
 const InProgressOrderScreen = () => {
-  const {
-    paymentMethod,
-    orderStatus,
-    orderNumber,
-    orderType,
-    totalPrice,
-    userName: initialUserName,
-    step: initialStep,
-  } = useLocalSearchParams();
+  const { orderNumber } = useLocalSearchParams();
 
-  const [step, setStep] = useState(initialStep ? Number(initialStep) : 1);
-  const [userName, setUserName] = useState<string | null>(
-    (initialUserName as string) || 'Usuario',
-  );
+  const [step, setStep] = useState(2); // Inicializa en 2 por defecto
+  const [userName, setUserName] = useState<string | null>('Usuario');
+  const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -44,29 +40,39 @@ const InProgressOrderScreen = () => {
     fetchUserName();
   }, []);
 
-  // Normaliza el método de pago recibido
-  function normalizePaymentMethod(
-    method: unknown,
-  ): 'CARD' | 'CASH' | 'BANK_TRANSFER' | 'MOBILE_PAYMENT' | null {
-    if (!method) return null;
-    const value = Array.isArray(method) ? method[0] : method;
-    switch ((value as string)?.toUpperCase?.()) {
-      case 'CARD':
-        return 'CARD';
-      case 'CASH':
-        return 'CASH';
-      case 'BANK_TRANSFER':
-        return 'BANK_TRANSFER';
-      case 'MOBILE_PAYMENT':
-        return 'MOBILE_PAYMENT';
-      default:
-        return null;
-    }
-  }
+  useEffect(() => {
+    const fetchOrder = async () => {
+      if (!orderNumber) return;
+      try {
+        const sdk = PharmaTech.getInstance();
+        const jwt = await SecureStore.getItemAsync('auth_token');
+        if (!jwt) {
+          console.error('No JWT found in SecureStore');
+          return;
+        }
+        const orderData = await sdk.order.getById(orderNumber as string, jwt);
+        setOrder(orderData);
+      } catch (error) {
+        console.error('Error fetching order:', error);
+      }
+    };
+    fetchOrder();
+  }, [orderNumber]);
 
   return (
-    <ScrollView contentContainerStyle={styles.scrollContainer}>
-      <View style={styles.container}>
+    <ScrollView
+      contentContainerStyle={
+        step === 3
+          ? { flexGrow: 1, justifyContent: 'flex-end' }
+          : styles.scrollContainer
+      }
+    >
+      <View
+        style={[
+          styles.container,
+          step === 3 && { flex: 1, justifyContent: 'flex-end' },
+        ]}
+      >
         <View style={styles.steps}>
           <Steps
             totalSteps={stepsLabels.length}
@@ -81,29 +87,38 @@ const InProgressOrderScreen = () => {
             </PoppinsText>
           </>
         )}
-        {step === 2 && (
+        {step === 2 && order && (
           <>
             <PoppinsText style={styles.purchaseOptionsTitle}>
               Visualización de datos
             </PoppinsText>
+            <View style={styles.paymentInfoFormContainer}>
+              <PaymentInfoForm
+                paymentMethod={
+                  order.paymentMethod
+                    ? (order.paymentMethod.toUpperCase() as
+                        | 'CARD'
+                        | 'CASH'
+                        | 'BANK_TRANSFER'
+                        | 'MOBILE_PAYMENT'
+                        | null)
+                    : null
+                }
+                total={order.totalPrice ? String(order.totalPrice) : ''}
+                onValidationChange={() => {}}
+                onBankChange={() => {}}
+                onReferenceChange={() => {}}
+                onDocumentNumberChange={() => {}}
+                onPhoneChange={() => {}}
+              />
+            </View>
             <View style={styles.whiteBackgroundContainer}>
-              <View style={styles.paymentInfoFormContainer}>
-                <PaymentInfoForm
-                  paymentMethod={normalizePaymentMethod(paymentMethod)}
-                  total={totalPrice ? String(totalPrice) : ''}
-                  onValidationChange={() => {}}
-                  onBankChange={() => {}}
-                  onReferenceChange={() => {}}
-                  onDocumentNumberChange={() => {}}
-                  onPhoneChange={() => {}}
-                />
-              </View>
               <OrderSummary />
               <View style={styles.totalContainer}>
                 <View style={styles.totalRow}>
                   <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
                   <PoppinsText style={styles.totalAmount}>
-                    ${totalPrice ? totalPrice : ''}
+                    ${order.totalPrice ? order.totalPrice : ''}
                   </PoppinsText>
                 </View>
               </View>
@@ -119,33 +134,37 @@ const InProgressOrderScreen = () => {
             </View>
           </>
         )}
-        {step === 3 && (
+        {step === 3 && order && (
           <>
             <PoppinsText style={styles.purchaseOptionsTitle}>
               Confirmacion de la orden
             </PoppinsText>
             <PaymentStatusMessage
-              orderStatus={orderStatus as OrderStatus}
-              orderNumber={truncateString(orderNumber as string, 8, '')}
+              orderStatus={order.status as OrderStatus}
+              orderNumber={truncateString(order.id as string, 8, '')}
               userName={userName || ''}
             />
-            <View style={styles.whiteBackgroundContainer}>
-              <View style={styles.confirmationContainer}>
-                {/* Show additional confirmation message based on status and type */}
-                {orderStatus === 'approved' && orderType === 'pickup' && (
-                  <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>
-                )}
-                {orderStatus === 'approved' && orderType === 'delivery' && (
-                  <PoppinsText>Tu pedido está en camino.</PoppinsText>
-                )}
-              </View>
-              <OrderSummary />
-              <View style={styles.totalContainer}>
-                <View style={styles.totalRow}>
-                  <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-                  <PoppinsText style={styles.totalAmount}>
-                    ${totalPrice ? totalPrice : ''}
-                  </PoppinsText>
+            <View style={{ flex: 1, justifyContent: 'flex-end' }}>
+              <View style={styles.whiteBackgroundContainer}>
+                <View style={styles.confirmationContainer}>
+                  {/* Show additional confirmation message based on status and type */}
+                  {order.status === 'approved' && order.type === 'pickup' && (
+                    <PoppinsText>
+                      Tu pedido está listo para recoger.
+                    </PoppinsText>
+                  )}
+                  {order.status === 'approved' && order.type === 'delivery' && (
+                    <PoppinsText>Tu pedido está en camino.</PoppinsText>
+                  )}
+                </View>
+                <OrderSummary />
+                <View style={styles.totalContainer}>
+                  <View style={styles.totalRow}>
+                    <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+                    <PoppinsText style={styles.totalAmount}>
+                      ${order.totalPrice ? order.totalPrice : ''}
+                    </PoppinsText>
+                  </View>
                 </View>
               </View>
             </View>
@@ -166,7 +185,6 @@ const styles = StyleSheet.create({
   },
   steps: {
     marginTop: 30,
-    marginBottom: 20,
     padding: 20,
   },
   stepLabel: {
@@ -176,10 +194,8 @@ const styles = StyleSheet.create({
     paddingVertical: 8,
   },
   purchaseOptionsTitle: {
-    paddingVertical: 16,
     fontSize: FontSizes.h5.size,
     color: Colors.textMain,
-    marginBottom: 30,
     alignSelf: 'flex-start',
     padding: 20,
   },

From 82493575c820f05fee0b723a14f23ce6d431dddb Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 18:48:11 -0400
Subject: [PATCH 255/291] Update InProgressOrderScreen to skip step 2 for CARD
 and CASH payment methods

---
 src/screens/InProgressOrderScreen.tsx | 103 +++++++++++++++-----------
 1 file changed, 58 insertions(+), 45 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index b155a1c..a179ba8 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -52,6 +52,15 @@ const InProgressOrderScreen = () => {
         }
         const orderData = await sdk.order.getById(orderNumber as string, jwt);
         setOrder(orderData);
+
+        // Si el método de pago es CARD o CASH, ir directo al step 3
+        if (
+          orderData &&
+          orderData.paymentMethod &&
+          ['CARD', 'CASH'].includes(orderData.paymentMethod.toUpperCase())
+        ) {
+          setStep(3);
+        }
       } catch (error) {
         console.error('Error fetching order:', error);
       }
@@ -87,53 +96,57 @@ const InProgressOrderScreen = () => {
             </PoppinsText>
           </>
         )}
-        {step === 2 && order && (
-          <>
-            <PoppinsText style={styles.purchaseOptionsTitle}>
-              Visualización de datos
-            </PoppinsText>
-            <View style={styles.paymentInfoFormContainer}>
-              <PaymentInfoForm
-                paymentMethod={
-                  order.paymentMethod
-                    ? (order.paymentMethod.toUpperCase() as
-                        | 'CARD'
-                        | 'CASH'
-                        | 'BANK_TRANSFER'
-                        | 'MOBILE_PAYMENT'
-                        | null)
-                    : null
-                }
-                total={order.totalPrice ? String(order.totalPrice) : ''}
-                onValidationChange={() => {}}
-                onBankChange={() => {}}
-                onReferenceChange={() => {}}
-                onDocumentNumberChange={() => {}}
-                onPhoneChange={() => {}}
-              />
-            </View>
-            <View style={styles.whiteBackgroundContainer}>
-              <OrderSummary />
-              <View style={styles.totalContainer}>
-                <View style={styles.totalRow}>
-                  <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-                  <PoppinsText style={styles.totalAmount}>
-                    ${order.totalPrice ? order.totalPrice : ''}
-                  </PoppinsText>
-                </View>
-              </View>
-              <View style={styles.buttonContainer}>
-                <Button
-                  title="Confirmar Orden"
-                  size="medium"
-                  style={styles.nextButton}
-                  variant="primary"
-                  onPress={() => setStep(3)}
+        {/* Ocultar step 2 si el método de pago es CARD o CASH */}
+        {step === 2 &&
+          order &&
+          order.paymentMethod &&
+          !['CARD', 'CASH'].includes(order.paymentMethod.toUpperCase()) && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Visualización de datos
+              </PoppinsText>
+              <View style={styles.paymentInfoFormContainer}>
+                <PaymentInfoForm
+                  paymentMethod={
+                    order.paymentMethod
+                      ? (order.paymentMethod.toUpperCase() as
+                          | 'CARD'
+                          | 'CASH'
+                          | 'BANK_TRANSFER'
+                          | 'MOBILE_PAYMENT'
+                          | null)
+                      : null
+                  }
+                  total={order.totalPrice ? String(order.totalPrice) : ''}
+                  onValidationChange={() => {}}
+                  onBankChange={() => {}}
+                  onReferenceChange={() => {}}
+                  onDocumentNumberChange={() => {}}
+                  onPhoneChange={() => {}}
                 />
               </View>
-            </View>
-          </>
-        )}
+              <View style={styles.whiteBackgroundContainer}>
+                <OrderSummary />
+                <View style={styles.totalContainer}>
+                  <View style={styles.totalRow}>
+                    <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
+                    <PoppinsText style={styles.totalAmount}>
+                      ${order.totalPrice ? order.totalPrice : ''}
+                    </PoppinsText>
+                  </View>
+                </View>
+                <View style={styles.buttonContainer}>
+                  <Button
+                    title="Confirmar Orden"
+                    size="medium"
+                    style={styles.nextButton}
+                    variant="primary"
+                    onPress={() => setStep(3)}
+                  />
+                </View>
+              </View>
+            </>
+          )}
         {step === 3 && order && (
           <>
             <PoppinsText style={styles.purchaseOptionsTitle}>

From 057ab04b47760234ef562f6ae32effe2952e7a79 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 19:17:23 -0400
Subject: [PATCH 256/291] Refactor InProgressOrderScreen, integrate order
 updates via WebSocket

---
 src/hooks/useOrderSocket.ts           | 103 ------------------------
 src/screens/CheckoutScreen.tsx        |   5 +-
 src/screens/InProgressOrderScreen.tsx | 108 ++++++++++++++++++++++----
 3 files changed, 93 insertions(+), 123 deletions(-)
 delete mode 100644 src/hooks/useOrderSocket.ts

diff --git a/src/hooks/useOrderSocket.ts b/src/hooks/useOrderSocket.ts
deleted file mode 100644
index a62caa5..0000000
--- a/src/hooks/useOrderSocket.ts
+++ /dev/null
@@ -1,103 +0,0 @@
-import { useEffect, useRef } from 'react';
-import io, { Socket } from 'socket.io-client';
-import * as SecureStore from 'expo-secure-store';
-import { SOCKET_URL } from '../lib/socketUrl';
-
-export type OrderStatus =
-  | 'requested'
-  | 'approved'
-  | 'ready_for_pickup'
-  | 'in_progress'
-  | 'canceled'
-  | 'completed';
-
-export interface Order {
-  id: string;
-  status: OrderStatus;
-}
-
-export function useOrderSocket(
-  orderId: string | null,
-  onOrderUpdated: (order: Order) => void,
-): Socket | null {
-  const socketRef = useRef<Socket | null>(null);
-
-  useEffect(() => {
-    if (!orderId) return;
-    let isMounted = true;
-
-    const setupSocket = async () => {
-      const token = await SecureStore.getItemAsync('auth_token');
-      if (!isMounted || !token) return;
-
-      const authHeader = `Bearer ${token}`;
-
-      const sock = io(SOCKET_URL, {
-        transportOptions: {
-          polling: {
-            extraHeaders: { Authorization: authHeader },
-          },
-        },
-      });
-
-      socketRef.current = sock;
-
-      sock.on('connect', () => {
-        console.log('[WS] Conectado con ID:', sock.id);
-        // Unirse al room de la orden
-        sock.emit('joinOrder', orderId);
-        // Solicitar el objeto completo de la orden
-        sock.emit('getOrder', orderId);
-      });
-
-      sock.on('disconnect', (reason) =>
-        console.log('[WS] Desconectado:', reason),
-      );
-
-      sock.on('connect_error', (err) =>
-        console.log('[WS] Error en handshake:', err.message),
-      );
-
-      // Depuración de todos los eventos entrantes
-      sock.onAny((event, ...args) =>
-        console.log('[WS] evento recibido:', event, args),
-      );
-
-      // Evento inicial con el objeto completo de la orden
-      sock.on('order', (Order: Order) => {
-        if (Order.id === orderId) {
-          console.log('[WS] Orden inicial recibida:', Order);
-          onOrderUpdated(Order);
-        }
-      });
-
-      // Evento ligero para actualizaciones de status
-      sock.on(
-        'orderUpdated',
-        (orderUpdated: { orderId: string; status: OrderStatus }) => {
-          if (orderUpdated.orderId === orderId) {
-            console.log('[WS] Status actualizado:', orderUpdated.status);
-            onOrderUpdated({
-              id: orderUpdated.orderId,
-              status: orderUpdated.status,
-            });
-          }
-        },
-      );
-
-      // Iniciar la conexión una vez registrados todos los listeners
-      sock.connect();
-    };
-
-    setupSocket();
-
-    return () => {
-      isMounted = false;
-      socketRef.current?.offAny();
-      socketRef.current?.disconnect();
-      socketRef.current = null;
-    };
-  }, [orderId, onOrderUpdated]);
-
-  return socketRef.current;
-}
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index c15eb2b..20fc18c 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -39,10 +39,7 @@ import {
   setCouponDiscount,
   setCouponApplied,
 } from '../redux/slices/checkoutSlice';
-import {} from // useOrderSocket, // commented: unused
-// OrderStatus, // commented: unused
-// Order as OrderSocketType, // commented: unused
-'../hooks/useOrderSocket';
+
 import {
   OrderType,
   CreateOrder,
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index a179ba8..83128b5 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState, useEffect, useRef } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import PaymentInfoForm from '../components/PaymentInfoForm';
@@ -16,6 +16,8 @@ import {
   PharmaTech,
 } from '@pharmatech/sdk';
 import * as SecureStore from 'expo-secure-store';
+import io, { Socket } from 'socket.io-client';
+import { SOCKET_URL } from '../lib/socketUrl';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -26,9 +28,11 @@ const stepsLabels = [
 const InProgressOrderScreen = () => {
   const { orderNumber } = useLocalSearchParams();
 
-  const [step, setStep] = useState(2); // Inicializa en 2 por defecto
+  // Siempre inicia en step 3
+  const [step, setStep] = useState(3);
   const [userName, setUserName] = useState<string | null>('Usuario');
   const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
+  const socketRef = useRef<Socket | null>(null);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -53,20 +57,103 @@ const InProgressOrderScreen = () => {
         const orderData = await sdk.order.getById(orderNumber as string, jwt);
         setOrder(orderData);
 
-        // Si el método de pago es CARD o CASH, ir directo al step 3
+        // Solo cambia a step 2 si status es 'approved' y paymentMethod es BANK_TRANSFER o MOBILE_PAYMENT
         if (
           orderData &&
+          orderData.status &&
+          orderData.status.toLowerCase() === 'approved' &&
           orderData.paymentMethod &&
-          ['CARD', 'CASH'].includes(orderData.paymentMethod.toUpperCase())
+          ['BANK_TRANSFER', 'MOBILE_PAYMENT'].includes(
+            orderData.paymentMethod.toUpperCase(),
+          )
         ) {
-          setStep(3);
+          setStep(2);
+          return; // Salir para evitar setStep(3) abajo
         }
+        setStep(3);
       } catch (error) {
         console.error('Error fetching order:', error);
       }
     };
     fetchOrder();
   }, [orderNumber]);
+  console.log('Order Number:', order);
+
+  useEffect(() => {
+    if (!orderNumber) return;
+    let isMounted = true;
+
+    const setupSocket = async () => {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!isMounted || !token) return;
+
+      const authHeader = `Bearer ${token}`;
+
+      const sock = io(SOCKET_URL, {
+        transportOptions: {
+          polling: {
+            extraHeaders: { Authorization: authHeader },
+          },
+        },
+      });
+
+      socketRef.current = sock;
+
+      sock.on('connect', () => {
+        // Unirse al room de la orden y solicitar el objeto completo
+        sock.emit('joinOrder', orderNumber);
+        sock.emit('getOrder', orderNumber);
+      });
+
+      sock.on('disconnect', (reason) =>
+        console.log('[WS] Desconectado:', reason),
+      );
+
+      sock.on('connect_error', (err) =>
+        console.log('[WS] Error en handshake:', err.message),
+      );
+
+      // Debug de todos los eventos
+      sock.onAny((event, ...args) =>
+        console.log('[WS] evento recibido:', event, args),
+      );
+
+      // Evento inicial con el objeto completo de la orden
+      sock.on('order', (Order: OrderDetailedResponse) => {
+        if (Order.id === orderNumber) {
+          setOrder((prev) => ({ ...prev, ...Order }));
+        }
+      });
+
+      // Evento ligero para actualizaciones de status
+      sock.on(
+        'orderUpdated',
+        (orderUpdated: { orderId: string; status: OrderStatus }) => {
+          if (orderUpdated.orderId === orderNumber) {
+            setOrder((prev) =>
+              prev
+                ? { ...prev, status: orderUpdated.status }
+                : ({
+                    id: orderUpdated.orderId,
+                    status: orderUpdated.status,
+                  } as OrderDetailedResponse),
+            );
+          }
+        },
+      );
+
+      sock.connect();
+    };
+
+    setupSocket();
+
+    return () => {
+      isMounted = false;
+      socketRef.current?.offAny();
+      socketRef.current?.disconnect();
+      socketRef.current = null;
+    };
+  }, [orderNumber]);
 
   return (
     <ScrollView
@@ -159,17 +246,6 @@ const InProgressOrderScreen = () => {
             />
             <View style={{ flex: 1, justifyContent: 'flex-end' }}>
               <View style={styles.whiteBackgroundContainer}>
-                <View style={styles.confirmationContainer}>
-                  {/* Show additional confirmation message based on status and type */}
-                  {order.status === 'approved' && order.type === 'pickup' && (
-                    <PoppinsText>
-                      Tu pedido está listo para recoger.
-                    </PoppinsText>
-                  )}
-                  {order.status === 'approved' && order.type === 'delivery' && (
-                    <PoppinsText>Tu pedido está en camino.</PoppinsText>
-                  )}
-                </View>
                 <OrderSummary />
                 <View style={styles.totalContainer}>
                   <View style={styles.totalRow}>

From 093183dba415bdd78eeef0e7ac49390363e7d519 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 19:22:45 -0400
Subject: [PATCH 257/291] Remove unused order status utility file

---
 src/utils/orderStatus.ts | 20 --------------------
 1 file changed, 20 deletions(-)
 delete mode 100644 src/utils/orderStatus.ts

diff --git a/src/utils/orderStatus.ts b/src/utils/orderStatus.ts
deleted file mode 100644
index da0a8d4..0000000
--- a/src/utils/orderStatus.ts
+++ /dev/null
@@ -1,20 +0,0 @@
-// src/utils/orderStatus.ts
-import type { OrderStatus } from '../hooks/useOrderSocket';
-
-export const STATUS_LABELS: Record<OrderStatus, string> = {
-  requested: 'Esperando aprobación',
-  approved: 'Aprobada por admin',
-  ready_for_pickup: 'Listo para recoger',
-  in_progress: 'En progreso',
-  canceled: 'Cancelada',
-  completed: 'Completada',
-};
-
-// Para un Stepper lineal:
-export const STATUS_FLOW: OrderStatus[] = [
-  'requested',
-  'approved',
-  'ready_for_pickup',
-  'in_progress',
-  'completed',
-];

From a8cbb49042e89a322bf80da1fa0a51995c60b87d Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 19:47:26 -0400
Subject: [PATCH 258/291] Add validation popup and refactor
 InProgressOrderScreen for payment form handling

---
 src/screens/InProgressOrderScreen.tsx | 215 ++++++++++++++------------
 1 file changed, 120 insertions(+), 95 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 83128b5..193c8c1 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -18,6 +18,7 @@ import {
 import * as SecureStore from 'expo-secure-store';
 import io, { Socket } from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
+import Popup from '../components/Popup';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -32,6 +33,8 @@ const InProgressOrderScreen = () => {
   const [step, setStep] = useState(3);
   const [userName, setUserName] = useState<string | null>('Usuario');
   const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
+  const [showValidationPopup, setShowValidationPopup] = useState(false);
+  const [paymentFormValid, setPaymentFormValid] = useState(false);
   const socketRef = useRef<Socket | null>(null);
 
   useEffect(() => {
@@ -156,111 +159,133 @@ const InProgressOrderScreen = () => {
   }, [orderNumber]);
 
   return (
-    <ScrollView
-      contentContainerStyle={
-        step === 3
-          ? { flexGrow: 1, justifyContent: 'flex-end' }
-          : styles.scrollContainer
-      }
-    >
-      <View
-        style={[
-          styles.container,
-          step === 3 && { flex: 1, justifyContent: 'flex-end' },
-        ]}
+    <>
+      <ScrollView
+        contentContainerStyle={
+          step === 3
+            ? { flexGrow: 1, justifyContent: 'flex-end' }
+            : styles.scrollContainer
+        }
       >
-        <View style={styles.steps}>
-          <Steps
-            totalSteps={stepsLabels.length}
-            currentStep={step}
-            labels={stepsLabels}
-          />
-        </View>
-        {step === 1 && (
-          <>
-            <PoppinsText style={styles.purchaseOptionsTitle}>
-              Opciones de Compra
-            </PoppinsText>
-          </>
-        )}
-        {/* Ocultar step 2 si el método de pago es CARD o CASH */}
-        {step === 2 &&
-          order &&
-          order.paymentMethod &&
-          !['CARD', 'CASH'].includes(order.paymentMethod.toUpperCase()) && (
+        <View
+          style={[
+            styles.container,
+            step === 3 && { flex: 1, justifyContent: 'flex-end' },
+          ]}
+        >
+          <View style={styles.steps}>
+            <Steps
+              totalSteps={stepsLabels.length}
+              currentStep={step}
+              labels={stepsLabels}
+            />
+          </View>
+          {step === 1 && (
             <>
               <PoppinsText style={styles.purchaseOptionsTitle}>
-                Visualización de datos
+                Opciones de Compra
               </PoppinsText>
-              <View style={styles.paymentInfoFormContainer}>
-                <PaymentInfoForm
-                  paymentMethod={
-                    order.paymentMethod
-                      ? (order.paymentMethod.toUpperCase() as
-                          | 'CARD'
-                          | 'CASH'
-                          | 'BANK_TRANSFER'
-                          | 'MOBILE_PAYMENT'
-                          | null)
-                      : null
-                  }
-                  total={order.totalPrice ? String(order.totalPrice) : ''}
-                  onValidationChange={() => {}}
-                  onBankChange={() => {}}
-                  onReferenceChange={() => {}}
-                  onDocumentNumberChange={() => {}}
-                  onPhoneChange={() => {}}
-                />
-              </View>
-              <View style={styles.whiteBackgroundContainer}>
-                <OrderSummary />
-                <View style={styles.totalContainer}>
-                  <View style={styles.totalRow}>
-                    <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-                    <PoppinsText style={styles.totalAmount}>
-                      ${order.totalPrice ? order.totalPrice : ''}
-                    </PoppinsText>
+            </>
+          )}
+          {/* Ocultar step 2 si el método de pago es CARD o CASH */}
+          {step === 2 &&
+            order &&
+            order.paymentMethod &&
+            !['CARD', 'CASH'].includes(order.paymentMethod.toUpperCase()) && (
+              <>
+                <PoppinsText style={styles.purchaseOptionsTitle}>
+                  Visualización de datos
+                </PoppinsText>
+                <View style={styles.paymentInfoFormContainer}>
+                  <PaymentInfoForm
+                    paymentMethod={
+                      order.paymentMethod
+                        ? (order.paymentMethod.toUpperCase() as
+                            | 'CARD'
+                            | 'CASH'
+                            | 'BANK_TRANSFER'
+                            | 'MOBILE_PAYMENT'
+                            | null)
+                        : null
+                    }
+                    total={order.totalPrice ? String(order.totalPrice) : ''}
+                    onValidationChange={setPaymentFormValid}
+                    onBankChange={() => {}}
+                    onReferenceChange={() => {}}
+                    onDocumentNumberChange={() => {}}
+                    onPhoneChange={() => {}}
+                  />
+                </View>
+                <View style={styles.whiteBackgroundContainer}>
+                  <OrderSummary />
+                  <View style={styles.totalContainer}>
+                    <View style={styles.totalRow}>
+                      <PoppinsText style={styles.totalLabel}>
+                        Total:
+                      </PoppinsText>
+                      <PoppinsText style={styles.totalAmount}>
+                        ${order.totalPrice ? order.totalPrice : ''}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                  <View style={styles.buttonContainer}>
+                    <Button
+                      title="Confirmar Orden"
+                      size="medium"
+                      style={styles.nextButton}
+                      variant="primary"
+                      onPress={() => {
+                        if (!paymentFormValid) {
+                          setShowValidationPopup(true);
+                          return;
+                        }
+                        setStep(3);
+                      }}
+                    />
                   </View>
                 </View>
-                <View style={styles.buttonContainer}>
-                  <Button
-                    title="Confirmar Orden"
-                    size="medium"
-                    style={styles.nextButton}
-                    variant="primary"
-                    onPress={() => setStep(3)}
-                  />
+              </>
+            )}
+          {step === 3 && order && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Confirmacion de la orden
+              </PoppinsText>
+              <PaymentStatusMessage
+                orderStatus={order.status as OrderStatus}
+                orderNumber={truncateString(order.id as string, 8, '')}
+                userName={userName || ''}
+              />
+              <View style={{ flex: 1, justifyContent: 'flex-end' }}>
+                <View style={styles.whiteBackgroundContainer}>
+                  <OrderSummary />
+                  <View style={styles.totalContainer}>
+                    <View style={styles.totalRow}>
+                      <PoppinsText style={styles.totalLabel}>
+                        Total:
+                      </PoppinsText>
+                      <PoppinsText style={styles.totalAmount}>
+                        ${order.totalPrice ? order.totalPrice : ''}
+                      </PoppinsText>
+                    </View>
+                  </View>
                 </View>
               </View>
             </>
           )}
-        {step === 3 && order && (
-          <>
-            <PoppinsText style={styles.purchaseOptionsTitle}>
-              Confirmacion de la orden
-            </PoppinsText>
-            <PaymentStatusMessage
-              orderStatus={order.status as OrderStatus}
-              orderNumber={truncateString(order.id as string, 8, '')}
-              userName={userName || ''}
-            />
-            <View style={{ flex: 1, justifyContent: 'flex-end' }}>
-              <View style={styles.whiteBackgroundContainer}>
-                <OrderSummary />
-                <View style={styles.totalContainer}>
-                  <View style={styles.totalRow}>
-                    <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
-                    <PoppinsText style={styles.totalAmount}>
-                      ${order.totalPrice ? order.totalPrice : ''}
-                    </PoppinsText>
-                  </View>
-                </View>
-              </View>
-            </View>
-          </>
-        )}
-      </View>
-    </ScrollView>
+        </View>
+      </ScrollView>
+      <Popup
+        visible={showValidationPopup}
+        headerText="Campos requeridos"
+        bodyText="Por favor completa y valida todos los campos requeridos antes de continuar."
+        primaryButton={{
+          text: 'Aceptar',
+          onPress: () => setShowValidationPopup(false),
+        }}
+        onClose={() => setShowValidationPopup(false)}
+      />
+    </>
   );
 };
 

From ddfdef4113d2598167f9383aec80ecd5efda03d9 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Sat, 24 May 2025 20:37:29 -0400
Subject: [PATCH 259/291] Refactor WebSocket

---
 src/screens/InProgressOrderScreen.tsx | 56 ++++++++++++---------------
 1 file changed, 24 insertions(+), 32 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 193c8c1..014357b 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -19,6 +19,7 @@ import * as SecureStore from 'expo-secure-store';
 import io, { Socket } from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
 import Popup from '../components/Popup';
+import { OrderService } from '../services/order';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -80,18 +81,18 @@ const InProgressOrderScreen = () => {
     };
     fetchOrder();
   }, [orderNumber]);
-  console.log('Order Number:', order);
 
   useEffect(() => {
     if (!orderNumber) return;
     let isMounted = true;
 
-    const setupSocket = async () => {
+    (async () => {
       const token = await SecureStore.getItemAsync('auth_token');
       if (!isMounted || !token) return;
 
       const authHeader = `Bearer ${token}`;
 
+      // Usamos directamente HTTPS como base URL
       const sock = io(SOCKET_URL, {
         transportOptions: {
           polling: {
@@ -102,57 +103,48 @@ const InProgressOrderScreen = () => {
 
       socketRef.current = sock;
 
+      // Listeners
       sock.on('connect', () => {
-        // Unirse al room de la orden y solicitar el objeto completo
+        console.log('[WS] conectado');
+        // Unirse al canal correspondiente
         sock.emit('joinOrder', orderNumber);
+        // Opcional: pedir estado inicial
         sock.emit('getOrder', orderNumber);
       });
-
       sock.on('disconnect', (reason) =>
-        console.log('[WS] Desconectado:', reason),
+        console.log('[WS] desconectado:', reason),
       );
-
       sock.on('connect_error', (err) =>
-        console.log('[WS] Error en handshake:', err.message),
-      );
-
-      // Debug de todos los eventos
-      sock.onAny((event, ...args) =>
-        console.log('[WS] evento recibido:', event, args),
+        console.log('[WS] error handshake:', err.message),
       );
 
-      // Evento inicial con el objeto completo de la orden
-      sock.on('order', (Order: OrderDetailedResponse) => {
-        if (Order.id === orderNumber) {
-          setOrder((prev) => ({ ...prev, ...Order }));
-        }
+      // Cuando el backend emite el objeto completo
+      sock.on('order', (data: OrderDetailedResponse) => {
+        if (!isMounted || data.id !== orderNumber) return;
+        setOrder(data);
       });
 
-      // Evento ligero para actualizaciones de status
+      // Cuando el backend emite sólo actualización de estado
       sock.on(
         'orderUpdated',
-        (orderUpdated: { orderId: string; status: OrderStatus }) => {
-          if (orderUpdated.orderId === orderNumber) {
-            setOrder((prev) =>
-              prev
-                ? { ...prev, status: orderUpdated.status }
-                : ({
-                    id: orderUpdated.orderId,
-                    status: orderUpdated.status,
-                  } as OrderDetailedResponse),
-            );
+        async (payload: { orderId: string; status: OrderStatus }) => {
+          if (!isMounted || payload.orderId !== orderNumber) return;
+          try {
+            const updated = await OrderService.getById(payload.orderId);
+            setOrder(updated);
+          } catch (e) {
+            console.error('Error refrescando orden:', e);
           }
         },
       );
 
+      // Ahora sí, arrancamos la conexión
       sock.connect();
-    };
-
-    setupSocket();
+    })();
 
     return () => {
       isMounted = false;
-      socketRef.current?.offAny();
+      socketRef.current?.off();
       socketRef.current?.disconnect();
       socketRef.current = null;
     };

From 96c0b3fc82c6063da5ec64812150fbb5f0814efe Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Sat, 24 May 2025 23:40:44 -0400
Subject: [PATCH 260/291] Update @pharmatech/sdk to version 0.4.19 and adjust
 styles in OrderTrackingScreen

---
 package-lock.json                   | 9 ++++-----
 package.json                        | 2 +-
 src/screens/OrderTrackingScreen.tsx | 2 +-
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95c5fb0..4b5246b 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.11",
+        "@pharmatech/sdk": "^0.4.19",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,10 +3592,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
-      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
-      "license": "MIT",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
+      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 62c765a..6475559 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.11",
+    "@pharmatech/sdk": "^0.4.19",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index fbaa3e2..d5dfbf5 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -288,7 +288,7 @@ const OrderTrackingScreen = () => {
                     <View style={{ marginRight: 10 }}>
                       <MapPinIcon color={Colors.primary} />
                     </View>
-                    <View>
+                    <View style={{ padding: 1 }}>
                       <PoppinsText style={{ marginBottom: 10 }}>
                         Dirección de Entrega:
                       </PoppinsText>

From 44e2cc4e3a622b82491b1c48d3baaa8007da598e Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 25 May 2025 15:40:19 -0400
Subject: [PATCH 261/291] Integrating delivery status websocket

---
 src/hooks/useNotifications.ts                 |   2 +-
 src/lib/deliverySocket/deliverySocket.ts      |  52 +++++++++
 src/lib/socketUrl.ts                          |   4 +-
 src/redux/slices/deliverySlice.ts             |  22 +++-
 src/screens/delivery/DeliveryDetailScreen.tsx | 103 +++++++++++++++---
 src/screens/delivery/DeliveryHomeScreen.tsx   |  42 ++++++-
 6 files changed, 202 insertions(+), 23 deletions(-)
 create mode 100644 src/lib/deliverySocket/deliverySocket.ts

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 127bb31..d3a0832 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -67,7 +67,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   useEffect(() => {
     const interval = setInterval(() => {
       void refreshNotifications();
-    }, 30_000); // ajusta intervalo según necesidad
+    }, 1200_000); // ajusta intervalo según necesidad
 
     return () => clearInterval(interval);
   }, [refreshNotifications]);
diff --git a/src/lib/deliverySocket/deliverySocket.ts b/src/lib/deliverySocket/deliverySocket.ts
new file mode 100644
index 0000000..5e5e3ec
--- /dev/null
+++ b/src/lib/deliverySocket/deliverySocket.ts
@@ -0,0 +1,52 @@
+import io, { Socket } from 'socket.io-client';
+import { SOCKET_URL } from '../socketUrl';
+import * as SecureStore from 'expo-secure-store';
+
+let socket: Socket | null = null;
+
+export const initializeSocket = async (): Promise<Socket> => {
+  if (socket) return socket;
+
+  const token = await SecureStore.getItemAsync('auth_token');
+  if (!token) {
+    console.error('Token de autenticación no encontrado');
+    throw new Error('Token de autenticación no encontrado');
+  }
+
+  console.log('Inicializando WebSocket con URL:', SOCKET_URL);
+  console.log('Enviando token JWT:', token);
+
+  socket = io(SOCKET_URL, {
+    autoConnect: false,
+    transports: ['polling'], // Asegurarnos de que ambos transportes estén habilitados
+    transportOptions: {
+      polling: {
+        extraHeaders: {
+          Authorization: `Bearer ${token}`,
+        },
+      },
+    },
+  });
+
+  socket.on('connect', () => {
+    console.log('WebSocket conectado exitosamente');
+  });
+
+  socket.on('connect_error', (error) => {
+    console.error('Error de conexión al WebSocket:', error);
+  });
+
+  socket.on('disconnect', (reason) => {
+    console.warn('WebSocket desconectado. Razón:', reason);
+  });
+
+  return socket;
+};
+
+export const disconnectSocket = () => {
+  if (socket) {
+    console.log('Desconectando WebSocket');
+    socket.disconnect();
+    socket = null;
+  }
+};
diff --git a/src/lib/socketUrl.ts b/src/lib/socketUrl.ts
index 65016c6..7788574 100644
--- a/src/lib/socketUrl.ts
+++ b/src/lib/socketUrl.ts
@@ -1,5 +1,5 @@
 const devModeFlag = process.env.PHARMATECH_DEV_MODE === 'true';
-const devUrl = 'ws://api-dev-8jfx.onrender.com';
-const prodUrl = 'ws://api-d8h5.onrender.com';
+const devUrl = 'https://api-dev-8jfx.onrender.com';
+const prodUrl = 'https://api-d8h5.onrender.com';
 
 export const SOCKET_URL = devModeFlag ? devUrl : prodUrl;
diff --git a/src/redux/slices/deliverySlice.ts b/src/redux/slices/deliverySlice.ts
index e2f7d42..4de3264 100644
--- a/src/redux/slices/deliverySlice.ts
+++ b/src/redux/slices/deliverySlice.ts
@@ -1,5 +1,8 @@
 import { createSlice, PayloadAction } from '@reduxjs/toolkit';
-import { OrderDeliveryDetailedResponse } from '@pharmatech/sdk';
+import {
+  OrderDeliveryDetailedResponse,
+  OrderDeliveryStatus,
+} from '@pharmatech/sdk';
 
 interface DeliveryState {
   orders: Record<string, OrderDeliveryDetailedResponse>; // Almacenar múltiples órdenes por ID
@@ -30,6 +33,15 @@ const deliverySlice = createSlice({
     ) {
       state.deliveryState[action.payload.id] = action.payload.state;
     },
+    updateDeliveryStatus(
+      state,
+      action: PayloadAction<{ id: string; status: OrderDeliveryStatus }>,
+    ) {
+      if (state.orders[action.payload.id]) {
+        state.orders[action.payload.id].deliveryStatus = action.payload
+          .status as OrderDeliveryStatus;
+      }
+    },
     resetOrderState(state, action: PayloadAction<string>) {
       delete state.orders[action.payload];
       delete state.deliveryState[action.payload];
@@ -37,6 +49,10 @@ const deliverySlice = createSlice({
   },
 });
 
-export const { setOrderDetails, setDeliveryState, resetOrderState } =
-  deliverySlice.actions;
+export const {
+  setOrderDetails,
+  setDeliveryState,
+  updateDeliveryStatus,
+  resetOrderState,
+} = deliverySlice.actions;
 export default deliverySlice.reducer;
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index 0e0b25e..be72c39 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -32,8 +32,14 @@ import { RootState } from '../../redux/store';
 import {
   setOrderDetails,
   setDeliveryState,
+  updateDeliveryStatus,
 } from '../../redux/slices/deliverySlice';
 import Popup from '../../components/Popup';
+import {
+  initializeSocket,
+  disconnectSocket,
+} from '../../lib/deliverySocket/deliverySocket';
+import { Socket } from 'socket.io-client';
 
 const DeliveryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
@@ -160,12 +166,10 @@ const DeliveryDetailScreen: React.FC = () => {
         }
 
         const orderId = orderDetails.orderId;
-        console.log('ID de la orden:', orderId);
 
         const order = await UserService.getOrder(orderId);
 
         if (order.success) {
-          console.log('Datos del pedido:', order.data);
           setOrder(order.data);
         } else {
           console.error('Error al obtener el pedido:', order.error);
@@ -183,6 +187,66 @@ const DeliveryDetailScreen: React.FC = () => {
     fetchOrder();
   }, [orderDetails]);
 
+  // Configuración del WebSocket para recibir actualizaciones en tiempo real
+  useEffect(() => {
+    let socket: Socket;
+
+    const setupSocket = async () => {
+      try {
+        socket = await initializeSocket();
+        console.log('Conectando al WebSocket...');
+        socket.connect();
+
+        socket.on('connect', () => {
+          console.log('WebSocket conectado en DeliveryDetailScreen');
+        });
+
+        socket.on('connect_error', (error) => {
+          console.error(
+            'Error de conexión al WebSocket en DeliveryDetailScreen:',
+            error,
+          );
+        });
+
+        socket.on('deliveryUpdated', (data: { id: string; status: string }) => {
+          console.log('Evento recibido: deliveryUpdated', data);
+          if (data.id === id) {
+            dispatch(
+              updateDeliveryStatus({
+                id: data.id,
+                status: data.status as OrderDeliveryStatus,
+              }),
+            );
+          }
+        });
+
+        socket.on('disconnect', (reason) => {
+          console.warn(
+            'WebSocket desconectado en DeliveryDetailScreen. Razón:',
+            reason,
+          );
+        });
+      } catch (error) {
+        console.error(
+          'Error configurando el WebSocket en DeliveryDetailScreen:',
+          error,
+        );
+      }
+    };
+
+    setupSocket();
+
+    return () => {
+      if (socket) {
+        console.log(
+          'Limpiando listeners y desconectando WebSocket en DeliveryDetailScreen',
+        );
+        socket.off('deliveryUpdated');
+        disconnectSocket();
+      }
+    };
+  }, [id, dispatch]);
+
   // Mostrar un indicador de carga mientras se obtienen los detalles del pedido o la orden
   if (isOrderDetailsLoading || isFetchingOrder) {
     return <ActivityIndicator size="large" color={Colors.primary} />;
@@ -207,29 +271,35 @@ const DeliveryDetailScreen: React.FC = () => {
         return;
       }
 
+      let nextStatus: OrderDeliveryStatus | null = null;
+
       // Lógica para otros estados
       switch (buttonStates[deliveryState]) {
         case 'Comenzar entrega':
-          await DeliveryService.updateOrderStatus(
-            orderDetails!.id,
-            OrderDeliveryStatus.WAITING_CONFIRMATION,
-          );
+          nextStatus = OrderDeliveryStatus.WAITING_CONFIRMATION;
+          await DeliveryService.updateOrderStatus(orderDetails!.id, nextStatus);
           break;
         case 'Ya tengo los productos del pedido':
-          await DeliveryService.updateOrderStatus(
-            orderDetails!.id,
-            OrderDeliveryStatus.PICKED_UP,
-          );
+          nextStatus = OrderDeliveryStatus.PICKED_UP;
+          await DeliveryService.updateOrderStatus(orderDetails!.id, nextStatus);
           break;
         case 'Ir a destino de entrega':
-          await DeliveryService.updateOrderStatus(
-            orderDetails!.id,
-            OrderDeliveryStatus.IN_ROUTE,
-          );
+          nextStatus = OrderDeliveryStatus.IN_ROUTE;
+          await DeliveryService.updateOrderStatus(orderDetails!.id, nextStatus);
           setDeliveryStateBadge(1); // Cambiar a "Haciendo entrega del pedido"
           break;
       }
 
+      if (nextStatus) {
+        // Emitir el evento al WebSocket
+        const socket = await initializeSocket();
+        socket.emit('deliveryUpdated', {
+          id: orderDetails!.id,
+          status: nextStatus,
+        });
+      }
+
+      // Mostrar alerta de éxito
       setAlertType('info');
       setAlertMessage('Se actualizó el estado del pedido.');
       setShowAlert(true);
@@ -238,12 +308,14 @@ const DeliveryDetailScreen: React.FC = () => {
         setShowAlert(false);
       }, 2500);
 
+      // Actualizar el estado local
       dispatch(
         setDeliveryState({ id: id as string, state: deliveryState + 1 }),
       );
     } catch (error) {
       console.error('Error al actualizar el estado del delivery:', error);
 
+      // Mostrar alerta de error
       setAlertType('error');
       setAlertMessage('Hubo un problema al actualizar el estado del pedido.');
       setShowAlert(true);
@@ -436,8 +508,7 @@ const DeliveryDetailScreen: React.FC = () => {
             productos
           </PoppinsText>
         </View>
-        {order?.details?.map((detail, index) => {
-          console.log(`Producto ${index + 1}:`, detail); // Log para depuración
+        {order?.details?.map((detail) => {
           return (
             <View
               key={detail.productPresentation.id}
diff --git a/src/screens/delivery/DeliveryHomeScreen.tsx b/src/screens/delivery/DeliveryHomeScreen.tsx
index 4136972..3485722 100644
--- a/src/screens/delivery/DeliveryHomeScreen.tsx
+++ b/src/screens/delivery/DeliveryHomeScreen.tsx
@@ -1,5 +1,5 @@
 import { useFocusEffect } from '@react-navigation/native'; // Importar useFocusEffect
-import React, { useCallback, useState } from 'react';
+import React, { useCallback, useEffect, useState } from 'react';
 import {
   View,
   StyleSheet,
@@ -22,6 +22,11 @@ import {
 import { useAlert } from '../../components/AlertProvider'; // Importar el hook useAlert
 import * as Location from 'expo-location'; // Importar Location para obtener la ubicación actual
 import { Config } from '../../config'; // Importar la configuración de la API de Google Maps
+import {
+  initializeSocket,
+  disconnectSocket,
+} from '../../lib/deliverySocket/deliverySocket'; // Importar funciones de socket
+import { Socket } from 'socket.io-client'; // Importar el tipo Socket
 
 // Definir el tipo para un leg de la API de Google Maps Directions
 interface GoogleMapsLeg {
@@ -190,6 +195,41 @@ export default function DeliveryHomeScreen() {
     }, []),
   );
 
+  useEffect(() => {
+    let socket: Socket;
+
+    const setupSocket = async () => {
+      try {
+        socket = await initializeSocket();
+        socket.connect();
+
+        socket.on('deliveryUpdated', (data: { id: string; status: string }) => {
+          setOrders((prevOrders) =>
+            prevOrders.map((order) =>
+              order.id === data.id
+                ? {
+                    ...order,
+                    deliveryStatus: data.status as OrderDeliveryStatus,
+                  }
+                : order,
+            ),
+          );
+        });
+      } catch (error) {
+        console.error('Error configurando el WebSocket:', error);
+      }
+    };
+
+    setupSocket();
+
+    return () => {
+      if (socket) {
+        socket.off('deliveryUpdated');
+        disconnectSocket();
+      }
+    };
+  }, []);
+
   const handleTakeOrder = (order: OrderDeliveryDetailedResponse) => {
     const query = encodeURIComponent(JSON.stringify(order));
     router.push(`/deliveryDetail/${order.id}?data=${query}`);

From b130695fb3fa0599c375510aa9b37030dd46e216 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Sun, 25 May 2025 22:20:48 -0400
Subject: [PATCH 262/291] Integrating delivery real time location websocket

---
 src/components/DeliveryMap.tsx                | 53 ++--------------
 src/screens/delivery/DeliveryDetailScreen.tsx | 63 +++++++++++++++++++
 2 files changed, 68 insertions(+), 48 deletions(-)

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index 3546f1c..5ba7b4d 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -1,13 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
-import {
-  StyleSheet,
-  View,
-  Alert,
-  ActivityIndicator,
-  ViewStyle,
-} from 'react-native';
-import * as Location from 'expo-location';
+import { StyleSheet, View, ActivityIndicator, ViewStyle } from 'react-native';
 import { Config } from '../config';
 import { Colors } from '../styles/theme';
 
@@ -15,19 +8,17 @@ interface DeliveryMapProps {
   deliveryState: number;
   branchLocation: { latitude: number; longitude: number };
   customerLocation: { latitude: number; longitude: number };
-  style?: ViewStyle; // Permitir estilos personalizados
+  deliveryLocation: { latitude: number; longitude: number } | null; // NUEVO
+  style?: ViewStyle;
 }
 
 const DeliveryMap: React.FC<DeliveryMapProps> = ({
   deliveryState,
   branchLocation,
   customerLocation,
-  style, // Recibir el estilo como prop
+  deliveryLocation,
+  style,
 }) => {
-  const [deliveryLocation, setDeliveryLocation] = useState<{
-    latitude: number;
-    longitude: number;
-  } | null>(null);
   const [routeCoordinates, setRouteCoordinates] = useState<
     { latitude: number; longitude: number }[]
   >([]);
@@ -36,40 +27,6 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   >([]);
   const [isLoading, setIsLoading] = useState(true); // Estado de carga
 
-  // Solicitar permisos y obtener la ubicación del delivery
-  useEffect(() => {
-    const getDeliveryLocation = async () => {
-      try {
-        const { status } = await Location.getForegroundPermissionsAsync();
-        if (status !== 'granted') {
-          const { status: newStatus } =
-            await Location.requestForegroundPermissionsAsync();
-          if (newStatus !== 'granted') {
-            Alert.alert(
-              'Permiso denegado',
-              'No se pudo obtener la ubicación del delivery.',
-            );
-            return;
-          }
-        }
-
-        const location = await Location.getCurrentPositionAsync({});
-        setDeliveryLocation({
-          latitude: location.coords.latitude,
-          longitude: location.coords.longitude,
-        });
-      } catch (error) {
-        console.error('Error al obtener la ubicación del delivery:', error);
-        Alert.alert(
-          'Error',
-          'Hubo un problema al obtener la ubicación del delivery.',
-        );
-      }
-    };
-
-    getDeliveryLocation();
-  }, []);
-
   // Obtener la ruta desde Google Maps Directions API
   const fetchRoute = async (
     originLat: number,
diff --git a/src/screens/delivery/DeliveryDetailScreen.tsx b/src/screens/delivery/DeliveryDetailScreen.tsx
index be72c39..48c84c0 100644
--- a/src/screens/delivery/DeliveryDetailScreen.tsx
+++ b/src/screens/delivery/DeliveryDetailScreen.tsx
@@ -40,6 +40,7 @@ import {
   disconnectSocket,
 } from '../../lib/deliverySocket/deliverySocket';
 import { Socket } from 'socket.io-client';
+import * as Location from 'expo-location';
 
 const DeliveryDetailScreen: React.FC = () => {
   const { id } = useLocalSearchParams();
@@ -94,6 +95,10 @@ const DeliveryDetailScreen: React.FC = () => {
   ];
 
   const [showConfirmationPopup, setShowConfirmationPopup] = useState(false);
+  const [deliveryLocation, setDeliveryLocation] = useState<{
+    latitude: number;
+    longitude: number;
+  } | null>(null);
 
   useEffect(() => {
     const fetchOrderDetails = async () => {
@@ -247,6 +252,62 @@ const DeliveryDetailScreen: React.FC = () => {
     };
   }, [id, dispatch]);
 
+  // ...existing code...
+
+  useEffect(() => {
+    let socket: Socket;
+    let locationSubscription: Location.LocationSubscription | null = null;
+
+    const startTracking = async () => {
+      try {
+        socket = await initializeSocket();
+        socket.connect();
+
+        // Permisos de ubicación
+        const { status } = await Location.requestForegroundPermissionsAsync();
+        if (status !== 'granted') {
+          console.warn('Permiso de ubicación denegado');
+          return;
+        }
+
+        // Suscribirse a cambios de ubicación
+        locationSubscription = await Location.watchPositionAsync(
+          {
+            accuracy: Location.Accuracy.High,
+            timeInterval: 5000, // cada 5 segundos
+            distanceInterval: 10, // o cada 10 metros
+          },
+          (location) => {
+            const { latitude, longitude } = location.coords;
+            setDeliveryLocation({ latitude, longitude });
+
+            // Emitir coordenadas por WebSocket
+            if (orderDetails?.id) {
+              socket.emit('updateCoordinates', {
+                orderId: orderDetails.id,
+                latitude,
+                longitude,
+              });
+            }
+          },
+        );
+      } catch (error) {
+        console.error('Error en el tracking de ubicación:', error);
+      }
+    };
+
+    startTracking();
+
+    return () => {
+      if (locationSubscription) {
+        locationSubscription.remove();
+      }
+      if (socket) {
+        disconnectSocket();
+      }
+    };
+  }, [orderDetails?.id]);
+
   // Mostrar un indicador de carga mientras se obtienen los detalles del pedido o la orden
   if (isOrderDetailsLoading || isFetchingOrder) {
     return <ActivityIndicator size="large" color={Colors.primary} />;
@@ -483,6 +544,7 @@ const DeliveryDetailScreen: React.FC = () => {
           deliveryState={deliveryState}
           branchLocation={branchLocation}
           customerLocation={customerLocation}
+          deliveryLocation={deliveryLocation}
           style={{ height: 300, marginBottom: 16 }}
         />
 
@@ -591,6 +653,7 @@ const DeliveryDetailScreen: React.FC = () => {
             deliveryState={deliveryState}
             branchLocation={branchLocation}
             customerLocation={customerLocation}
+            deliveryLocation={deliveryLocation}
           />
 
           {/* Botón flotante sobre el modal */}

From a94dcf6d21cbd5e61f83c5e7164a8f4ba8f25e4c Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Mon, 26 May 2025 17:11:45 -0400
Subject: [PATCH 263/291] Implement WebSocket InProgressOrderScreen for
 real-time order updates

---
 src/screens/InProgressOrderScreen.tsx | 140 ++++++++++++++++----------
 1 file changed, 86 insertions(+), 54 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 014357b..ee77d73 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -1,4 +1,4 @@
-import React, { useState, useEffect, useRef } from 'react';
+import React, { useState, useEffect } from 'react';
 import { View, StyleSheet, ScrollView } from 'react-native';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import PaymentInfoForm from '../components/PaymentInfoForm';
@@ -21,6 +21,57 @@ import { SOCKET_URL } from '../lib/socketUrl';
 import Popup from '../components/Popup';
 import { OrderService } from '../services/order';
 
+// --- SOCKET MANAGEMENT ---
+let socket: Socket | null = null;
+
+export const initializeSocket = async (): Promise<Socket> => {
+  if (socket) return socket;
+
+  const token = await SecureStore.getItemAsync('auth_token');
+  if (!token) {
+    console.error('Token de autenticación no encontrado');
+    throw new Error('Token de autenticación no encontrado');
+  }
+
+  console.log('Inicializando WebSocket con URL:', SOCKET_URL);
+  console.log('Enviando token JWT:', token);
+
+  socket = io(SOCKET_URL, {
+    autoConnect: false,
+    transports: ['polling'],
+    transportOptions: {
+      polling: {
+        extraHeaders: {
+          Authorization: `Bearer ${token}`,
+        },
+      },
+    },
+  });
+
+  socket.on('connect', () => {
+    console.log('WebSocket conectado exitosamente');
+  });
+
+  socket.on('connect_error', (error) => {
+    console.error('Error de conexión al WebSocket:', error);
+  });
+
+  socket.on('disconnect', (reason) => {
+    console.warn('WebSocket desconectado. Razón:', reason);
+  });
+
+  return socket;
+};
+
+export const disconnectSocket = () => {
+  if (socket) {
+    console.log('Desconectando WebSocket');
+    socket.disconnect();
+    socket = null;
+  }
+};
+// --- END SOCKET MANAGEMENT ---
+
 const stepsLabels = [
   'Opciones de Compra',
   'Visualización de datos',
@@ -36,7 +87,6 @@ const InProgressOrderScreen = () => {
   const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
   const [showValidationPopup, setShowValidationPopup] = useState(false);
   const [paymentFormValid, setPaymentFormValid] = useState(false);
-  const socketRef = useRef<Socket | null>(null);
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -85,68 +135,50 @@ const InProgressOrderScreen = () => {
   useEffect(() => {
     if (!orderNumber) return;
     let isMounted = true;
+    let localSocket: Socket | null = null;
 
     (async () => {
-      const token = await SecureStore.getItemAsync('auth_token');
-      if (!isMounted || !token) return;
-
-      const authHeader = `Bearer ${token}`;
-
-      // Usamos directamente HTTPS como base URL
-      const sock = io(SOCKET_URL, {
-        transportOptions: {
-          polling: {
-            extraHeaders: { Authorization: authHeader },
-          },
-        },
-      });
-
-      socketRef.current = sock;
+      try {
+        localSocket = await initializeSocket();
 
-      // Listeners
-      sock.on('connect', () => {
-        console.log('[WS] conectado');
-        // Unirse al canal correspondiente
-        sock.emit('joinOrder', orderNumber);
-        // Opcional: pedir estado inicial
-        sock.emit('getOrder', orderNumber);
-      });
-      sock.on('disconnect', (reason) =>
-        console.log('[WS] desconectado:', reason),
-      );
-      sock.on('connect_error', (err) =>
-        console.log('[WS] error handshake:', err.message),
-      );
+        localSocket.on('connect', () => {
+          console.log('[WS] conectado');
+          localSocket?.emit('joinOrder', orderNumber);
+          localSocket?.emit('getOrder', orderNumber);
+        });
 
-      // Cuando el backend emite el objeto completo
-      sock.on('order', (data: OrderDetailedResponse) => {
-        if (!isMounted || data.id !== orderNumber) return;
-        setOrder(data);
-      });
+        localSocket.on('order', (data: OrderDetailedResponse) => {
+          if (!isMounted || data.id !== orderNumber) return;
+          setOrder(data);
+        });
 
-      // Cuando el backend emite sólo actualización de estado
-      sock.on(
-        'orderUpdated',
-        async (payload: { orderId: string; status: OrderStatus }) => {
-          if (!isMounted || payload.orderId !== orderNumber) return;
-          try {
-            const updated = await OrderService.getById(payload.orderId);
-            setOrder(updated);
-          } catch (e) {
-            console.error('Error refrescando orden:', e);
-          }
-        },
-      );
+        // Escuchar el evento orderUpdated para actualizar el estado de la orden
+        localSocket.on(
+          'orderUpdated',
+          async (payload: { orderId: string; status: OrderStatus }) => {
+            if (!isMounted || payload.orderId !== orderNumber) return;
+            try {
+              const onOrderUpdated = await OrderService.getById(payload.status);
+              setOrder(onOrderUpdated);
+            } catch (e) {
+              console.error('Error refrescando orden:', e);
+            }
+          },
+        );
 
-      // Ahora sí, arrancamos la conexión
-      sock.connect();
+        localSocket.connect();
+      } catch (err) {
+        console.error('Error inicializando socket:', err);
+      }
     })();
 
     return () => {
       isMounted = false;
-      socketRef.current?.off();
-      socketRef.current?.disconnect();
-      socketRef.current = null;
+      if (localSocket) {
+        localSocket.off('order');
+        localSocket.off('orderUpdated');
+      }
+      disconnectSocket();
     };
   }, [orderNumber]);
 

From 3df3a68405f70848202d6da6d49b630bedc02038 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Mon, 26 May 2025 20:57:41 -0400
Subject: [PATCH 264/291] Fixing the way discounts worked in cartlist coming
 from  productDetails

---
 package-lock.json                   |  8 +--
 package.json                        |  6 +--
 src/components/CardButton.tsx       |  7 ++-
 src/hooks/useCart.ts                | 20 +++++++-
 src/redux/slices/cartSlice.ts       | 25 ++++++---
 src/screens/CartListScreen.tsx      | 17 +++++--
 src/screens/ProductDetailScreen.tsx | 79 ++++++++++++++++++++++++-----
 src/screens/tab/HomeScreen.tsx      | 33 +-----------
 src/screens/tab/OffersScreen.tsx    |  7 ++-
 9 files changed, 132 insertions(+), 70 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 95c5fb0..ac7f9d9 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.11",
+        "@pharmatech/sdk": "^0.4.19",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,9 +3592,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.11",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.11.tgz",
-      "integrity": "sha512-iJChZa3uTsQrz6kLZJfnwrBTZOe2o6azPlwk/ByiMxA5V7UlPfVp8sDz4EIppYbBl2+uM4sLMGnQmiWatKEECA==",
+      "version": "0.4.19",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
+      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index 62c765a..bd58b0d 100644
--- a/package.json
+++ b/package.json
@@ -19,13 +19,14 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.11",
+    "@pharmatech/sdk": "^0.4.19",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
     "date-fns": "^4.1.0",
     "expo": "~52.0.37",
     "expo-constants": "~17.0.7",
+    "expo-dev-client": "~5.0.20",
     "expo-font": "~13.0.4",
     "expo-image-picker": "~16.0.6",
     "expo-linking": "~7.0.5",
@@ -51,8 +52,7 @@
     "react-native-svg": "^15.11.2",
     "react-redux": "^9.2.0",
     "socket.io-client": "^4.8.1",
-    "tailwindcss": "^3.4.17",
-    "expo-dev-client": "~5.0.20"
+    "tailwindcss": "^3.4.17"
   },
   "devDependencies": {
     "@babel/core": "^7.25.2",
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index db632b2..ea62541 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -19,15 +19,16 @@ const CardButton: React.FC<CardButtonProps> = ({
 }) => {
   const [count, setCount] = useState(initialValue);
   const [showCounter, setShowCounter] = useState(false);
+  const [hasInteracted, setHasInteracted] = useState(false);
 
   const toggleCounter = () => setShowCounter(count > 0);
   useEffect(toggleCounter, [count]);
 
   useEffect(() => {
-    if (getValue) {
+    if (hasInteracted && getValue) {
       getValue(count);
     }
-    if (syncQuantity) {
+    if (hasInteracted && syncQuantity) {
       syncQuantity(count);
     }
   }, [count]);
@@ -37,11 +38,13 @@ const CardButton: React.FC<CardButtonProps> = ({
   }, [initialValue]);
 
   const incrementCount = () => {
+    setHasInteracted(true);
     setCount((prev) => prev + 1);
   };
 
   const decrementCount = () => {
     if (count > 0) {
+      setHasInteracted(true);
       setCount((prev) => prev - 1);
     }
   };
diff --git a/src/hooks/useCart.ts b/src/hooks/useCart.ts
index 05eae89..6fd2a91 100644
--- a/src/hooks/useCart.ts
+++ b/src/hooks/useCart.ts
@@ -15,6 +15,8 @@ export const useCart = () => {
   const userId = useSelector((state: RootState) => state.cart.userId);
 
   const addToCart = (item: CartItem) => {
+    if (item.quantity <= 0) return; // <-- NO agregar si cantidad es 0
+    console.log('[addToCart] Item añadido al carrito:', item); // <-- LOG
     dispatch(addItem(item));
   };
 
@@ -22,8 +24,22 @@ export const useCart = () => {
     dispatch(removeItem(id));
   };
 
-  const updateCartQuantity = (id: string, quantity: number) => {
-    dispatch(updateQuantity({ id, quantity }));
+  const updateCartQuantity = (
+    id: string,
+    quantity: number,
+    discount?: number,
+    price?: number,
+  ) => {
+    // Busca el item actual en el carrito
+    const item = cartItems.find((item) => item.id === id);
+    dispatch(
+      updateQuantity({
+        id,
+        quantity,
+        discount: typeof discount === 'number' ? discount : item?.discount,
+        price: typeof price === 'number' ? price : item?.price,
+      }),
+    );
   };
 
   const getItemQuantity = (id: string) => {
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 9505d0d..017b1d9 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -36,14 +36,16 @@ const cartSlice = createSlice({
       }
     },
     addItem: (state, action: PayloadAction<CartItem>) => {
-      const existingItem = state.items.find(
+      const existing = state.items.find(
         (item) => item.id === action.payload.id,
       );
-      if (existingItem) {
-        existingItem.quantity = action.payload.quantity;
-        existingItem.discount = action.payload.discount;
+      if (existing) {
+        // Si ya existe, actualiza cantidad y descuento correctamente
+        existing.quantity = action.payload.quantity;
+        existing.price = action.payload.price;
+        existing.discount = action.payload.discount; // <-- ¡Asegúrate de actualizar el descuento!
       } else {
-        state.items.push(action.payload);
+        state.items.push({ ...action.payload });
       }
       state.total = calculateTotal(state.items);
     },
@@ -53,11 +55,22 @@ const cartSlice = createSlice({
     },
     updateQuantity: (
       state,
-      action: PayloadAction<{ id: string; quantity: number }>,
+      action: PayloadAction<{
+        id: string;
+        quantity: number;
+        discount?: number;
+        price?: number;
+      }>,
     ) => {
       const item = state.items.find((item) => item.id === action.payload.id);
       if (item) {
         item.quantity = action.payload.quantity;
+        if (typeof action.payload.discount === 'number') {
+          item.discount = action.payload.discount;
+        }
+        if (typeof action.payload.price === 'number') {
+          item.price = action.payload.price;
+        }
       }
       state.total = calculateTotal(state.items);
     },
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index 4ae6477..6937e9e 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -32,6 +32,7 @@ const CartListScreen = () => {
   const total = subtotal - totalDiscount; // Subtotal with discount
 
   const renderItem = ({ item }: { item: CartItem }) => {
+    console.log('[CartListScreen] Renderizando item:', item); // <-- LOG
     // Usar el descuento del item, si existe, si no 0
     const discount = item.discount ?? 0;
     const discountedPrice = item.price * (1 - discount / 100);
@@ -62,9 +63,11 @@ const CartListScreen = () => {
               <PoppinsText style={styles.productTotalPrice}>
                 ${totalDiscountedPrice.toFixed(2)}
               </PoppinsText>
-              <PoppinsText style={styles.productOriginalPrice}>
-                ${totalOriginalPrice.toFixed(2)}
-              </PoppinsText>
+              {discount > 0 && (
+                <PoppinsText style={styles.productOriginalPrice}>
+                  ${totalOriginalPrice.toFixed(2)}
+                </PoppinsText>
+              )}
             </View>
           </View>
           <PoppinsText style={styles.productPrice}>
@@ -72,9 +75,13 @@ const CartListScreen = () => {
           </PoppinsText>
           <View style={styles.quantityContainer}>
             <CardButton
-              getValue={(quantity) => updateCartQuantity(item.id, quantity)}
+              getValue={(quantity) =>
+                updateCartQuantity(item.id, quantity, item.discount ?? 0)
+              }
               initialValue={item.quantity > 0 ? item.quantity : 0}
-              syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
+              syncQuantity={(quantity) =>
+                updateCartQuantity(item.id, quantity, item.discount ?? 0)
+              }
             />
             <TouchableOpacity
               onPress={() => removeFromCart(item.id)}
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 2a9eaf2..ad23d49 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -291,7 +291,21 @@ const ProductDetailScreen: React.FC = () => {
     );
   };
 
-  console.log('Current inventory state:', inventory); // Log para inspeccionar el estado de inventory
+  const getProductDiscount = () => {
+    // Busca promo en product.promo
+    if (product?.promo && typeof product.promo.discount === 'number') {
+      return product.promo.discount;
+    }
+    return 0;
+  };
+
+  const getOriginalPrice = () => product?.price ?? 0;
+  const getDiscount = () => getProductDiscount();
+  const getFinalPrice = () => {
+    const original = getOriginalPrice();
+    const discount = getDiscount();
+    return discount > 0 ? (original * (100 - discount)) / 100 : original;
+  };
 
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
@@ -383,10 +397,24 @@ const ProductDetailScreen: React.FC = () => {
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
-              <PoppinsText style={styles.price}>$ {product?.price}</PoppinsText>
-              {/* {discount && ( // Comentado */}
-              {/*   <PoppinsText style={styles.discount}>-{discount}%</PoppinsText> */}
-              {/* )} */}
+              {product ? (
+                getDiscount() > 0 ? (
+                  <>
+                    <PoppinsText style={styles.price}>
+                      ${getFinalPrice()}
+                    </PoppinsText>
+                    <PoppinsText style={styles.discountBadge}>
+                      -{getDiscount()}%
+                    </PoppinsText>
+                  </>
+                ) : (
+                  <PoppinsText style={styles.price}>
+                    ${getOriginalPrice()}
+                  </PoppinsText>
+                )
+              ) : (
+                <ActivityIndicator size="small" color={Colors.primary} />
+              )}
             </View>
             <PoppinsText
               style={[
@@ -583,7 +611,26 @@ const ProductDetailScreen: React.FC = () => {
           <CardButton
             size={10}
             getValue={(quantity) => {
-              if (product?.id) updateCartQuantity(product.id, quantity);
+              if (product?.id && quantity > 0) {
+                const promo = product.promo;
+                const discount =
+                  typeof promo?.discount === 'number' ? promo.discount : 0;
+                addToCart({
+                  id: product.id,
+                  name:
+                    product.product.name +
+                    ' ' +
+                    product.presentation.name +
+                    ' ' +
+                    product.presentation.quantity +
+                    ' ' +
+                    product.presentation.measurementUnit,
+                  price: product.price,
+                  quantity,
+                  image: images?.[0]?.url || 'https://via.placeholder.com/150',
+                  discount,
+                });
+              }
             }}
             initialValue={getQuantity()}
           />
@@ -636,6 +683,20 @@ const styles = StyleSheet.create({
     color: Colors.primary,
     marginRight: 10,
   },
+  originalPrice: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.disableText,
+    textDecorationLine: 'line-through',
+    marginRight: 14,
+  },
+  discountBadge: {
+    fontSize: FontSizes.c1.size,
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 5,
+    padding: 4,
+    color: Colors.textWhite,
+    marginRight: 10,
+  },
   productName: {
     textAlign: 'center',
     fontSize: FontSizes.h5.size,
@@ -698,12 +759,6 @@ const styles = StyleSheet.create({
     alignItems: 'flex-end',
     zIndex: 999,
   },
-  discount: {
-    fontSize: FontSizes.b4.size,
-    backgroundColor: Colors.semanticInfo,
-    borderRadius: 5,
-    padding: 4,
-  },
 });
 
 export default ProductDetailScreen;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 395e00b..5465fa3 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -21,7 +21,7 @@ export default function HomeScreen() {
   const router = useRouter();
   const { showEmailVerification: showEmailVerificationParam } =
     useLocalSearchParams();
-  const { cartItems, addToCart, updateCartQuantity, setCartUserId } = useCart();
+  const { cartItems, updateCartQuantity, setCartUserId } = useCart();
 
   const getItemQuantity = (productId: string) => {
     const cartItem = cartItems.find((item) => item.id === productId.toString());
@@ -90,22 +90,6 @@ export default function HomeScreen() {
             finalPrice: p.price,
             quantity: getItemQuantity(p.id),
             getQuantity: (quantity: number) => {
-              addToCart({
-                id: p.id,
-                name:
-                  p.product.name +
-                  ' ' +
-                  p.presentation.name +
-                  ' ' +
-                  p.presentation.quantity +
-                  ' ' +
-                  p.presentation.measurementUnit,
-                price: p.price,
-                quantity,
-                image:
-                  p.product.images?.[0]?.url ||
-                  'https://via.placeholder.com/150',
-              });
               updateCartQuantity(p.id, quantity);
             },
           };
@@ -152,21 +136,6 @@ export default function HomeScreen() {
           finalPrice: p.price,
           quantity: getItemQuantity(p.id),
           getQuantity: (quantity: number) => {
-            addToCart({
-              id: p.id,
-              name:
-                p.product.name +
-                ' ' +
-                p.presentation.name +
-                ' ' +
-                p.presentation.quantity +
-                ' ' +
-                p.presentation.measurementUnit,
-              price: p.price,
-              quantity,
-              image:
-                p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
-            });
             updateCartQuantity(p.id, quantity);
           },
         };
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 0bd9b5f..f94ce9b 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -1,4 +1,3 @@
-// src/screens/tab/OffersScreen.tsx
 import React, { useState, useEffect } from 'react';
 import {
   View,
@@ -145,7 +144,7 @@ const styles = StyleSheet.create({
   container: {
     flex: 1,
     backgroundColor: Colors.bgColor,
-    paddingLeft: 5,
+    paddingHorizontal: 5,
   },
   title: {
     fontSize: FontSizes.s1.size,
@@ -153,12 +152,12 @@ const styles = StyleSheet.create({
     paddingHorizontal: 15,
   },
   list: {
-    paddingHorizontal: 10,
     paddingBottom: 20,
+    justifyContent: 'center',
+    alignItems: 'center',
   },
   columnWrapper: {
     justifyContent: 'space-between',
-    paddingHorizontal: 10,
   },
   loaderContainer: {
     flex: 1,

From bccfa052ff528314b1b3463a74933bfb779edd4c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 27 May 2025 17:18:03 -0400
Subject: [PATCH 265/291] Fixing prices to work with cents

---
 src/components/Card.tsx             |  5 +++--
 src/screens/CartListScreen.tsx      | 13 +++++++------
 src/screens/OrdersScreen.tsx        |  3 ++-
 src/screens/ProductDetailScreen.tsx |  5 +++--
 src/utils/formatPrice.ts            |  8 ++++++++
 5 files changed, 23 insertions(+), 11 deletions(-)
 create mode 100644 src/utils/formatPrice.ts

diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index d44247c..8e492cb 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -7,6 +7,7 @@ import { truncateString } from '../utils/commons';
 import { useCart } from '../hooks/useCart';
 import { Product } from '../types/Product';
 import { useRouter } from 'expo-router';
+import { formatPrice } from '../utils/formatPrice';
 
 const ProductCard: React.FC<Product> = ({
   id,
@@ -81,7 +82,7 @@ const ProductCard: React.FC<Product> = ({
           {discount && (
             <View style={styles.priceContainer}>
               <PoppinsText style={styles.originalPrice}>
-                ${originalPrice}
+                ${formatPrice(originalPrice ?? 0)}
               </PoppinsText>
               <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
             </View>
@@ -89,7 +90,7 @@ const ProductCard: React.FC<Product> = ({
           <PoppinsText
             style={[styles.finalPrice, !discount && { color: Colors.textMain }]}
           >
-            ${computedFinalPrice}
+            ${formatPrice(computedFinalPrice)}
           </PoppinsText>
         </View>
       </View>
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index 6937e9e..89beb9f 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -14,6 +14,7 @@ import type { CartItem } from '../redux/slices/cartSlice';
 import Button from '../components/Button';
 import { TrashIcon } from 'react-native-heroicons/outline';
 import { useRouter } from 'expo-router';
+import { formatPrice } from '../utils/formatPrice';
 
 const CartListScreen = () => {
   const router = useRouter();
@@ -61,17 +62,17 @@ const CartListScreen = () => {
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <View style={{ alignItems: 'flex-end' }}>
               <PoppinsText style={styles.productTotalPrice}>
-                ${totalDiscountedPrice.toFixed(2)}
+                ${formatPrice(totalDiscountedPrice)}
               </PoppinsText>
               {discount > 0 && (
                 <PoppinsText style={styles.productOriginalPrice}>
-                  ${totalOriginalPrice.toFixed(2)}
+                  ${formatPrice(totalOriginalPrice)}
                 </PoppinsText>
               )}
             </View>
           </View>
           <PoppinsText style={styles.productPrice}>
-            (${discountedPrice.toFixed(2)} c/u)
+            (${formatPrice(discountedPrice)} c/u)
           </PoppinsText>
           <View style={styles.quantityContainer}>
             <CardButton
@@ -134,19 +135,19 @@ const CartListScreen = () => {
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
               <PoppinsText style={styles.subtotalText}>
-                ${subtotal.toFixed(2)}
+                ${formatPrice(subtotal)}
               </PoppinsText>
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
               <PoppinsText style={styles.discountText}>
-                -${totalDiscount.toFixed(2)}
+                -${formatPrice(totalDiscount)}
               </PoppinsText>
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.totalText}>Total</PoppinsText>
               <PoppinsText style={styles.totalText}>
-                ${total.toFixed(2)}
+                ${formatPrice(total)}
               </PoppinsText>
             </View>
             <Button
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index d7dfa26..aa48501 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -16,6 +16,7 @@ import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
 import OrderBadge from '../components/OrderBadge';
 import { useCart } from '../hooks/useCart';
+import { formatPrice } from '../utils/formatPrice';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -159,7 +160,7 @@ const OrdersScreen = () => {
                       {/* Formatear fecha */}
                     </PoppinsText>
                   </View>
-                  <PoppinsText>${order.totalPrice.toFixed(2)}</PoppinsText>
+                  <PoppinsText>${formatPrice(order.totalPrice)}</PoppinsText>
                 </View>
                 <View
                   style={{
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index ad23d49..d0728a4 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -40,6 +40,7 @@ import {
 } from '@pharmatech/sdk';
 import Button from '../components/Button';
 import { BranchService } from '../services/branches';
+import { formatPrice } from '../utils/formatPrice';
 
 const ProductDetailScreen: React.FC = () => {
   const { id, productId } = useLocalSearchParams<{
@@ -401,7 +402,7 @@ const ProductDetailScreen: React.FC = () => {
                 getDiscount() > 0 ? (
                   <>
                     <PoppinsText style={styles.price}>
-                      ${getFinalPrice()}
+                      ${formatPrice(getFinalPrice())}
                     </PoppinsText>
                     <PoppinsText style={styles.discountBadge}>
                       -{getDiscount()}%
@@ -409,7 +410,7 @@ const ProductDetailScreen: React.FC = () => {
                   </>
                 ) : (
                   <PoppinsText style={styles.price}>
-                    ${getOriginalPrice()}
+                    ${formatPrice(getOriginalPrice())}
                   </PoppinsText>
                 )
               ) : (
diff --git a/src/utils/formatPrice.ts b/src/utils/formatPrice.ts
new file mode 100644
index 0000000..8e0c1e4
--- /dev/null
+++ b/src/utils/formatPrice.ts
@@ -0,0 +1,8 @@
+export function formatPrice(value: number, options?: Intl.NumberFormatOptions) {
+  // Divide entre 100 y muestra con dos decimales
+  return (value / 100).toLocaleString('es-VE', {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+    ...options,
+  });
+}

From 4abbe91e515c4693f7bd398b036990c26a6db175 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Tue, 27 May 2025 17:44:50 -0400
Subject: [PATCH 266/291] Fixing some services according to the solution
 implemented in checkout PR

---
 src/services/order.ts               | 14 ++++++++++++++
 src/services/paymentConfirmation.ts |  1 +
 src/types/api.d.ts                  |  1 +
 3 files changed, 16 insertions(+)

diff --git a/src/services/order.ts b/src/services/order.ts
index 81b1f2d..da3c1ae 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -26,4 +26,18 @@ export const OrderService = {
       throw new Error(extractErrorMessage(error));
     }
   },
+
+  getById: async (orderId: string) => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+      const orderDetail = await api.order.getById(orderId, token);
+      return orderDetail;
+    } catch (error) {
+      console.error('Error en OrderService.getById:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };
diff --git a/src/services/paymentConfirmation.ts b/src/services/paymentConfirmation.ts
index 7a8c33e..de25636 100644
--- a/src/services/paymentConfirmation.ts
+++ b/src/services/paymentConfirmation.ts
@@ -24,6 +24,7 @@ export const PaymentConfirmationService = {
         'phoneNumber',
         'bank',
         'reference',
+        'orderId',
       ];
       for (const field of requiredFields) {
         if (!paymentConfirmation[field]) {
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 1cfae9b..2cf6ed0 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -201,6 +201,7 @@ export interface PaymentConfirmation {
   reference: string;
   documentId: string;
   phoneNumber: string;
+  orderId: string;
 }
 
 export interface PaymentConfirmationResponse extends BaseModel {

From f52a55fca384a3b1dea6c533238e7147f00c4651 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Tue, 27 May 2025 20:52:35 -0400
Subject: [PATCH 267/291] Add VerticalStepper component and integrate it into
 OrderTrackingScreen

---
 src/components/VerticalStepper.tsx  | 134 ++++++++++++++++++++++
 src/screens/OrderTrackingScreen.tsx | 168 ++++++++++++----------------
 2 files changed, 205 insertions(+), 97 deletions(-)
 create mode 100644 src/components/VerticalStepper.tsx

diff --git a/src/components/VerticalStepper.tsx b/src/components/VerticalStepper.tsx
new file mode 100644
index 0000000..2c983ab
--- /dev/null
+++ b/src/components/VerticalStepper.tsx
@@ -0,0 +1,134 @@
+import React from 'react';
+import { View, StyleSheet } from 'react-native';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from './PoppinsText';
+
+interface VerticalStepperProps {
+  steps: {
+    title: string;
+    description: string;
+  }[];
+  currentStep: number;
+}
+
+const VerticalStepper: React.FC<VerticalStepperProps> = ({
+  steps,
+  currentStep,
+}) => {
+  return (
+    <View style={styles.container}>
+      {steps.map((step, index) => {
+        const isCompleted = index < currentStep;
+        const isActive = index === currentStep;
+
+        return (
+          <View key={index} style={styles.stepContainer}>
+            <View style={styles.stepIndicatorContainer}>
+              {/* Línea superior (excepto para el primer paso) */}
+              {index > 0 && (
+                <View
+                  style={[
+                    styles.connector,
+                    isCompleted || isActive
+                      ? styles.completedConnector
+                      : styles.pendingConnector,
+                  ]}
+                />
+              )}
+
+              {/* Círculo del paso */}
+              <View
+                style={[
+                  styles.stepIndicator,
+                  isCompleted && styles.completedStep,
+                  isActive && styles.activeStep,
+                ]}
+              ></View>
+
+              {/* Línea inferior (excepto para el último paso) */}
+              {index < steps.length - 1 && (
+                <View
+                  style={[
+                    styles.connector,
+                    isCompleted
+                      ? styles.completedConnector
+                      : styles.pendingConnector,
+                    { top: 0, bottom: 0 },
+                  ]}
+                />
+              )}
+            </View>
+            <View style={styles.stepContent}>
+              <PoppinsText
+                style={[
+                  isActive && styles.activeStepTitle,
+                  isCompleted && styles.activeStepTitle,
+                ]}
+              >
+                {step.title}
+              </PoppinsText>
+              {step.description && (
+                <PoppinsText style={styles.stepDescription}>
+                  {step.description}
+                </PoppinsText>
+              )}
+            </View>
+          </View>
+        );
+      })}
+    </View>
+  );
+};
+
+const styles = StyleSheet.create({
+  container: {
+    padding: 0,
+  },
+  stepContainer: {
+    flexDirection: 'row',
+  },
+  stepIndicatorContainer: {
+    width: 24,
+    alignItems: 'center',
+    marginRight: 8,
+  },
+  stepIndicator: {
+    width: 13,
+    height: 13,
+    borderRadius: 12,
+    justifyContent: 'center',
+    alignItems: 'center',
+    backgroundColor: Colors.gray_500,
+    zIndex: 1,
+  },
+  completedStep: {
+    backgroundColor: Colors.semanticSuccess,
+    borderColor: Colors.semanticSuccess,
+  },
+  activeStep: {
+    backgroundColor: Colors.semanticSuccess,
+  },
+  connector: {
+    position: 'absolute',
+    width: 2,
+  },
+  completedConnector: {
+    backgroundColor: Colors.semanticSuccess,
+  },
+  pendingConnector: {
+    backgroundColor: Colors.gray_100,
+  },
+  stepContent: {
+    flex: 1,
+    marginBottom: 13,
+  },
+  activeStepTitle: {
+    color: Colors.semanticSuccess,
+  },
+  stepDescription: {
+    color: Colors.secondaryGray,
+    fontSize: FontSizes.c3.size,
+  },
+});
+
+export default VerticalStepper;
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index d5dfbf5..e219861 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -4,7 +4,7 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useLocalSearchParams } from 'expo-router';
 import Alert from '../components/Alerts';
-import { OrderDetailedResponse } from '@pharmatech/sdk';
+import { OrderDetailedResponse, OrderStatus } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
 import * as SecureStore from 'expo-secure-store';
@@ -18,8 +18,9 @@ import {
   BuildingStorefrontIcon,
   MapPinIcon,
 } from 'react-native-heroicons/solid';
-import { io } from 'socket.io-client';
+import io from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
+import VerticalStepper from '../components/VerticalStepper';
 
 const OrderTrackingScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -31,15 +32,13 @@ const OrderTrackingScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
-
-  const [isConnected, setIsConnected] = useState(false);
-  const [transport, setTransport] = useState('N/A');
+  const [orderStatus, setOrderStatus] = useState('');
 
   useEffect(() => {
     const fetchOrder = async () => {
       try {
         const order = await UserService.getOrder(id);
-
+        console.log(order);
         if (order.success) {
           setOrder(order.data);
         }
@@ -57,6 +56,8 @@ const OrderTrackingScreen = () => {
       fetchOrder();
 
       const socket = io(SOCKET_URL, {
+        autoConnect: false,
+        transports: ['polling'],
         transportOptions: {
           polling: {
             extraHeaders: {
@@ -64,40 +65,39 @@ const OrderTrackingScreen = () => {
             },
           },
         },
-        transports: ['websocket'],
-        reconnection: true,
-        reconnectionAttempts: Infinity,
-        reconnectionDelay: 1000,
-        reconnectionDelayMax: 5000,
       });
 
-      function onConnect() {
-        setIsConnected(true);
-        console.log('[WS] Conectado con ID:', socket.id);
-        console.log('Connected to socket: ', isConnected);
-        setTransport(socket.io.engine.transport.name);
-
-        socket.on('order', (order) => {
-          console.log(order);
-        });
+      function onOrderUpdated(order: { orderId: string; status: OrderStatus }) {
+        setOrderStatus(order.status);
+        console.log('Estado de la orrrrdennnn: ', order.status);
       }
 
-      function onDisconnect() {
-        setIsConnected(false);
-        console.log(transport);
-        setTransport('N/A');
-      }
+      socket.connect();
+      socket.on('orderUpdated', onOrderUpdated);
 
       socket.on('connect_error', (err) =>
         console.log('[WS] Error en handshake:', err.message),
       );
 
+      socket.on('connect', () =>
+        console.log('[WS] Conectado con ID:', socket.id),
+      );
+      socket.on('disconnect', (reason) =>
+        console.log('[WS] Desconectado por:', reason),
+      );
+
+      return () => {
+        socket.off('orderUpdated', onOrderUpdated);
+        socket.disconnect();
+      };
+
+      /* sss
       socket.on('connect', onConnect);
       socket.on('disconnect', onDisconnect);
       return () => {
         //socket.off('connect', onConnect);
         //socket.off('disconnect', onDisconnect);
-      };
+      }; */
     }
   }, []);
 
@@ -109,6 +109,46 @@ const OrderTrackingScreen = () => {
     );
   }
 
+  const dateFormat: Intl.DateTimeFormatOptions = {
+    day: '2-digit',
+    month: 'long',
+    hour: '2-digit',
+    minute: '2-digit',
+    hour12: true,
+  };
+
+  const steps = [
+    {
+      title: 'Orden Confirmada',
+      description: order?.orderDeliveries
+        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
+            'es-ES',
+            dateFormat,
+          )
+        : '',
+    },
+    {
+      title:
+        order?.type === 'delivery' ? 'Repartidor en camino' : 'En preparación',
+      description: order?.orderDeliveries
+        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
+            'es-ES',
+            dateFormat,
+          )
+        : '',
+    },
+    {
+      title:
+        order?.type === 'delivery' ? 'Pedido entregado' : 'Listo para recoger',
+      description: order?.orderDeliveries
+        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
+            'es-ES',
+            dateFormat,
+          )
+        : '',
+    },
+  ];
+
   return (
     <ScrollView contentContainerStyle={styles.container}>
       <View style={styles.alertContainer}>
@@ -161,7 +201,7 @@ const OrderTrackingScreen = () => {
                 <PoppinsText style={{ color: Colors.semanticSuccess }}>
                   Entrega estimada:{' '}
                   {new Date(
-                    order?.orderDeliveries[0].estimatedTime,
+                    order?.orderDeliveries[0]?.estimatedTime,
                   ).toLocaleString('es-ES', {
                     day: '2-digit',
                     month: 'long',
@@ -177,7 +217,7 @@ const OrderTrackingScreen = () => {
                 <PoppinsText style={{ color: Colors.semanticSuccess }}>
                   Pickup:{' '}
                   {new Date(
-                    order?.orderDeliveries[0].estimatedTime,
+                    order?.orderDeliveries[0]?.estimatedTime,
                   ).toLocaleString('es-ES', {
                     day: '2-digit',
                     month: 'long',
@@ -189,75 +229,9 @@ const OrderTrackingScreen = () => {
               </>
             )}
           </View>
+          <PoppinsText>{orderStatus}</PoppinsText>
           <View style={{ marginVertical: 20 }}>
-            <View>
-              <PoppinsText>Orden Confirmada</PoppinsText>
-              <PoppinsText
-                style={{
-                  color: Colors.secondaryGray,
-                  fontSize: FontSizes.c3.size,
-                }}
-              >
-                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
-                  'es-ES',
-                  {
-                    day: '2-digit',
-                    month: 'long',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                    hour12: true,
-                  },
-                )}
-              </PoppinsText>
-            </View>
-            <View style={{ marginVertical: 15 }}>
-              <PoppinsText>
-                {order.type === 'delivery'
-                  ? 'Repartidor en camino'
-                  : 'En preparación'}
-              </PoppinsText>
-              <PoppinsText
-                style={{
-                  color: Colors.secondaryGray,
-                  fontSize: FontSizes.c3.size,
-                }}
-              >
-                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
-                  'es-ES',
-                  {
-                    day: '2-digit',
-                    month: 'long',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                    hour12: true,
-                  },
-                )}
-              </PoppinsText>
-            </View>
-            <View>
-              <PoppinsText>
-                {order.type === 'delivery'
-                  ? 'Pedido entregado'
-                  : 'Listo para recoger'}
-              </PoppinsText>
-              <PoppinsText
-                style={{
-                  color: Colors.secondaryGray,
-                  fontSize: FontSizes.c3.size,
-                }}
-              >
-                {new Date(order.orderDeliveries[0].createdAt).toLocaleString(
-                  'es-ES',
-                  {
-                    day: '2-digit',
-                    month: 'long',
-                    hour: '2-digit',
-                    minute: '2-digit',
-                    hour12: true,
-                  },
-                )}
-              </PoppinsText>
-            </View>
+            <VerticalStepper steps={steps} currentStep={0} />
           </View>
           <View>
             <View
@@ -327,7 +301,7 @@ const OrderTrackingScreen = () => {
                         Teléfono de Contacto:
                       </PoppinsText>
                       <PoppinsText>
-                        {'+' + order?.orderDeliveries[0].employee?.phoneNumber}
+                        {order?.orderDeliveries[0].employee?.phoneNumber}
                       </PoppinsText>
                     </View>
                   </View>

From 7edc5f7b5fc8924a557494470abe6583c367db83 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Tue, 27 May 2025 21:44:01 -0400
Subject: [PATCH 268/291] Refactor InProgressOrderScreen to utilize centralized
 WebSocket management and improve order update handling

---
 src/lib/deliverySocket/deliverySocket.ts |  52 ++++++++++
 src/screens/InProgressOrderScreen.tsx    | 117 +++++------------------
 2 files changed, 76 insertions(+), 93 deletions(-)
 create mode 100644 src/lib/deliverySocket/deliverySocket.ts

diff --git a/src/lib/deliverySocket/deliverySocket.ts b/src/lib/deliverySocket/deliverySocket.ts
new file mode 100644
index 0000000..5e5e3ec
--- /dev/null
+++ b/src/lib/deliverySocket/deliverySocket.ts
@@ -0,0 +1,52 @@
+import io, { Socket } from 'socket.io-client';
+import { SOCKET_URL } from '../socketUrl';
+import * as SecureStore from 'expo-secure-store';
+
+let socket: Socket | null = null;
+
+export const initializeSocket = async (): Promise<Socket> => {
+  if (socket) return socket;
+
+  const token = await SecureStore.getItemAsync('auth_token');
+  if (!token) {
+    console.error('Token de autenticación no encontrado');
+    throw new Error('Token de autenticación no encontrado');
+  }
+
+  console.log('Inicializando WebSocket con URL:', SOCKET_URL);
+  console.log('Enviando token JWT:', token);
+
+  socket = io(SOCKET_URL, {
+    autoConnect: false,
+    transports: ['polling'], // Asegurarnos de que ambos transportes estén habilitados
+    transportOptions: {
+      polling: {
+        extraHeaders: {
+          Authorization: `Bearer ${token}`,
+        },
+      },
+    },
+  });
+
+  socket.on('connect', () => {
+    console.log('WebSocket conectado exitosamente');
+  });
+
+  socket.on('connect_error', (error) => {
+    console.error('Error de conexión al WebSocket:', error);
+  });
+
+  socket.on('disconnect', (reason) => {
+    console.warn('WebSocket desconectado. Razón:', reason);
+  });
+
+  return socket;
+};
+
+export const disconnectSocket = () => {
+  if (socket) {
+    console.log('Desconectando WebSocket');
+    socket.disconnect();
+    socket = null;
+  }
+};
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index ee77d73..09f4371 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -16,61 +16,12 @@ import {
   PharmaTech,
 } from '@pharmatech/sdk';
 import * as SecureStore from 'expo-secure-store';
-import io, { Socket } from 'socket.io-client';
-import { SOCKET_URL } from '../lib/socketUrl';
 import Popup from '../components/Popup';
-import { OrderService } from '../services/order';
-
-// --- SOCKET MANAGEMENT ---
-let socket: Socket | null = null;
-
-export const initializeSocket = async (): Promise<Socket> => {
-  if (socket) return socket;
-
-  const token = await SecureStore.getItemAsync('auth_token');
-  if (!token) {
-    console.error('Token de autenticación no encontrado');
-    throw new Error('Token de autenticación no encontrado');
-  }
-
-  console.log('Inicializando WebSocket con URL:', SOCKET_URL);
-  console.log('Enviando token JWT:', token);
-
-  socket = io(SOCKET_URL, {
-    autoConnect: false,
-    transports: ['polling'],
-    transportOptions: {
-      polling: {
-        extraHeaders: {
-          Authorization: `Bearer ${token}`,
-        },
-      },
-    },
-  });
-
-  socket.on('connect', () => {
-    console.log('WebSocket conectado exitosamente');
-  });
-
-  socket.on('connect_error', (error) => {
-    console.error('Error de conexión al WebSocket:', error);
-  });
-
-  socket.on('disconnect', (reason) => {
-    console.warn('WebSocket desconectado. Razón:', reason);
-  });
-
-  return socket;
-};
-
-export const disconnectSocket = () => {
-  if (socket) {
-    console.log('Desconectando WebSocket');
-    socket.disconnect();
-    socket = null;
-  }
-};
-// --- END SOCKET MANAGEMENT ---
+import {
+  initializeSocket,
+  disconnectSocket,
+} from '../lib/deliverySocket/deliverySocket';
+import { Socket } from 'socket.io-client';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -133,54 +84,34 @@ const InProgressOrderScreen = () => {
   }, [orderNumber]);
 
   useEffect(() => {
-    if (!orderNumber) return;
-    let isMounted = true;
-    let localSocket: Socket | null = null;
+    let socket: Socket;
 
-    (async () => {
+    const setupSocket = async () => {
       try {
-        localSocket = await initializeSocket();
-
-        localSocket.on('connect', () => {
-          console.log('[WS] conectado');
-          localSocket?.emit('joinOrder', orderNumber);
-          localSocket?.emit('getOrder', orderNumber);
-        });
+        socket = await initializeSocket();
+        socket.connect();
 
-        localSocket.on('order', (data: OrderDetailedResponse) => {
-          if (!isMounted || data.id !== orderNumber) return;
-          setOrder(data);
+        socket.on('orderUpdated', (data: { id: string; status: string }) => {
+          setOrder((prevOrder) =>
+            prevOrder && prevOrder.id === data.id
+              ? { ...prevOrder, status: data.status as OrderStatus }
+              : prevOrder,
+          );
         });
-
-        // Escuchar el evento orderUpdated para actualizar el estado de la orden
-        localSocket.on(
-          'orderUpdated',
-          async (payload: { orderId: string; status: OrderStatus }) => {
-            if (!isMounted || payload.orderId !== orderNumber) return;
-            try {
-              const onOrderUpdated = await OrderService.getById(payload.status);
-              setOrder(onOrderUpdated);
-            } catch (e) {
-              console.error('Error refrescando orden:', e);
-            }
-          },
-        );
-
-        localSocket.connect();
-      } catch (err) {
-        console.error('Error inicializando socket:', err);
+      } catch (error) {
+        console.error('Error configurando el WebSocket:', error);
       }
-    })();
+    };
+
+    setupSocket();
 
     return () => {
-      isMounted = false;
-      if (localSocket) {
-        localSocket.off('order');
-        localSocket.off('orderUpdated');
+      if (socket) {
+        socket.off('orderUpdated');
+        disconnectSocket();
       }
-      disconnectSocket();
     };
-  }, [orderNumber]);
+  }, []);
 
   return (
     <>

From dcfacba4b9bef212a440c93c8d7d00e51f672f1e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Wed, 28 May 2025 22:22:54 -0400
Subject: [PATCH 269/291] Changing the socket structure

---
 src/screens/InProgressOrderScreen.tsx | 177 ++++++++++++++++++++------
 1 file changed, 138 insertions(+), 39 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 09f4371..35ac238 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -14,6 +14,7 @@ import {
   OrderStatus,
   OrderDetailedResponse,
   PharmaTech,
+  PaymentConfirmation,
 } from '@pharmatech/sdk';
 import * as SecureStore from 'expo-secure-store';
 import Popup from '../components/Popup';
@@ -22,6 +23,11 @@ import {
   disconnectSocket,
 } from '../lib/deliverySocket/deliverySocket';
 import { Socket } from 'socket.io-client';
+import Alert from '../components/Alerts';
+import { useRouter } from 'expo-router';
+import { useDispatch } from 'react-redux';
+import { clearCart } from '../redux/slices/cartSlice';
+import { resetCheckout } from '../redux/slices/checkoutSlice';
 
 const stepsLabels = [
   'Opciones de Compra',
@@ -38,6 +44,13 @@ const InProgressOrderScreen = () => {
   const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
   const [showValidationPopup, setShowValidationPopup] = useState(false);
   const [paymentFormValid, setPaymentFormValid] = useState(false);
+  const [bank, setBank] = useState('');
+  const [reference, setReference] = useState('');
+  const [documentNumber, setDocumentNumber] = useState('');
+  const [phoneNumber, setPhoneNumber] = useState('');
+  const [backendResponse, setBackendResponse] = useState<string | null>(null);
+  const router = useRouter();
+  const dispatch = useDispatch();
 
   useEffect(() => {
     const fetchUserName = async () => {
@@ -73,7 +86,7 @@ const InProgressOrderScreen = () => {
           )
         ) {
           setStep(2);
-          return; // Salir para evitar setStep(3) abajo
+          return;
         }
         setStep(3);
       } catch (error) {
@@ -83,51 +96,76 @@ const InProgressOrderScreen = () => {
     fetchOrder();
   }, [orderNumber]);
 
+  // 1) socket-only: actualiza order.status
   useEffect(() => {
     let socket: Socket;
-
     const setupSocket = async () => {
-      try {
-        socket = await initializeSocket();
-        socket.connect();
-
-        socket.on('orderUpdated', (data: { id: string; status: string }) => {
-          setOrder((prevOrder) =>
-            prevOrder && prevOrder.id === data.id
-              ? { ...prevOrder, status: data.status as OrderStatus }
-              : prevOrder,
+      socket = await initializeSocket();
+      socket.connect();
+      socket.on('orderUpdated', (data: { orderId: string; status: string }) => {
+        console.log('[Socket] orderUpdated received →', data);
+        if (orderNumber && data.orderId === orderNumber) {
+          setOrder((prev) =>
+            prev ? { ...prev, status: data.status as OrderStatus } : prev,
           );
-        });
-      } catch (error) {
-        console.error('Error configurando el WebSocket:', error);
-      }
+        }
+      });
     };
-
     setupSocket();
-
     return () => {
-      if (socket) {
-        socket.off('orderUpdated');
-        disconnectSocket();
-      }
+      socket?.off('orderUpdated');
+      disconnectSocket();
     };
-  }, []);
+  }, []); // solo al montar
+
+  // 2) efecto separado: cada vez que 'order' cambia, recalcula el step
+  useEffect(() => {
+    if (!order) return;
+    const normalized = order.status.toLowerCase();
+    const pm = order.paymentMethod?.toLowerCase();
+    if (
+      normalized === 'approved' &&
+      (pm === 'bank_transfer' || pm === 'mobile_payment')
+    ) {
+      setStep(2);
+    } else {
+      setStep(3);
+    }
+  }, [order]);
+
+  const handleContinue = () => {
+    // Limpiar el carrito al salir del flujo de checkout
+    dispatch(clearCart());
+    dispatch(resetCheckout());
+    router.dismissAll();
+    router.replace({
+      pathname: '/(tabs)',
+    });
+  };
 
   return (
     <>
+      {/* Alerta para mostrar la respuesta del backend */}
+      {backendResponse && (
+        <Alert
+          title="Respuesta"
+          message={backendResponse}
+          type={
+            backendResponse.includes('error') ||
+            backendResponse.includes('Error')
+              ? 'error'
+              : 'success'
+          }
+          alertStyle="regular"
+          borderColor={true}
+          onClose={() => setBackendResponse(null)}
+        />
+      )}
       <ScrollView
-        contentContainerStyle={
-          step === 3
-            ? { flexGrow: 1, justifyContent: 'flex-end' }
-            : styles.scrollContainer
-        }
+        contentContainerStyle={styles.scrollContainer}
+        // Elimina cualquier lógica condicional de justifyContent aquí
       >
-        <View
-          style={[
-            styles.container,
-            step === 3 && { flex: 1, justifyContent: 'flex-end' },
-          ]}
-        >
+        <View style={styles.container}>
           <View style={styles.steps}>
             <Steps
               totalSteps={stepsLabels.length}
@@ -165,10 +203,10 @@ const InProgressOrderScreen = () => {
                     }
                     total={order.totalPrice ? String(order.totalPrice) : ''}
                     onValidationChange={setPaymentFormValid}
-                    onBankChange={() => {}}
-                    onReferenceChange={() => {}}
-                    onDocumentNumberChange={() => {}}
-                    onPhoneChange={() => {}}
+                    onBankChange={setBank}
+                    onReferenceChange={setReference}
+                    onDocumentNumberChange={setDocumentNumber}
+                    onPhoneChange={setPhoneNumber}
                   />
                 </View>
                 <View style={styles.whiteBackgroundContainer}>
@@ -189,12 +227,56 @@ const InProgressOrderScreen = () => {
                       size="medium"
                       style={styles.nextButton}
                       variant="primary"
-                      onPress={() => {
+                      onPress={async () => {
                         if (!paymentFormValid) {
                           setShowValidationPopup(true);
                           return;
                         }
-                        setStep(3);
+                        try {
+                          const sdk = PharmaTech.getInstance();
+                          const jwt =
+                            await SecureStore.getItemAsync('auth_token');
+                          if (!jwt) {
+                            setBackendResponse('No JWT found en SecureStore');
+                            return;
+                          }
+                          const paymentConfirmation: PaymentConfirmation = {
+                            bank,
+                            reference,
+                            documentId: documentNumber,
+                            phoneNumber,
+                            orderId: order.id,
+                          };
+                          const response = await sdk.paymentConfirmation.create(
+                            paymentConfirmation,
+                            jwt,
+                          );
+                          // Puedes ajustar el mensaje según la estructura real de la respuesta
+                          setBackendResponse(
+                            response && response.id
+                              ? '¡Pago enviado correctamente!'
+                              : 'Respuesta recibida del servidor.',
+                          );
+                          setStep(3);
+                        } catch (error: unknown) {
+                          let errorMessage =
+                            'Error enviando confirmación de pago. Intenta nuevamente.';
+                          function hasMessage(
+                            e: unknown,
+                          ): e is { message: string } {
+                            return (
+                              typeof e === 'object' &&
+                              e !== null &&
+                              'message' in e &&
+                              typeof (e as { message?: unknown }).message ===
+                                'string'
+                            );
+                          }
+                          if (hasMessage(error)) {
+                            errorMessage = error.message;
+                          }
+                          setBackendResponse(errorMessage);
+                        }
                       }}
                     />
                   </View>
@@ -211,6 +293,17 @@ const InProgressOrderScreen = () => {
                 orderNumber={truncateString(order.id as string, 8, '')}
                 userName={userName || ''}
               />
+              {/* Botón Volver al Home en un View con padding 20 */}
+              <View style={{ padding: 20 }}>
+                <Button
+                  title="Volver al Home"
+                  size="medium"
+                  style={[styles.checkoutButton]}
+                  variant="secondaryLight"
+                  textStyle={{ color: Colors.textMain }}
+                  onPress={handleContinue}
+                />
+              </View>
               <View style={{ flex: 1, justifyContent: 'flex-end' }}>
                 <View style={styles.whiteBackgroundContainer}>
                   <OrderSummary />
@@ -247,6 +340,7 @@ const InProgressOrderScreen = () => {
 const styles = StyleSheet.create({
   scrollContainer: {
     flexGrow: 1,
+    justifyContent: 'flex-start', // Fuerza el contenido arriba SIEMPRE
   },
   container: {
     flex: 1,
@@ -255,6 +349,7 @@ const styles = StyleSheet.create({
   steps: {
     marginTop: 30,
     padding: 20,
+    // No uses flex ni justifyContent aquí
   },
   stepLabel: {
     fontSize: FontSizes.h5.size,
@@ -318,6 +413,10 @@ const styles = StyleSheet.create({
     lineHeight: FontSizes.h5.lineHeight,
     color: Colors.primary,
   },
+  checkoutButton: {
+    marginTop: 24,
+    width: '100%',
+  },
 });
 
 export default InProgressOrderScreen;

From dc0f7fa5938f53119fe8673f9934109afb68d1f3 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 29 May 2025 00:00:15 -0400
Subject: [PATCH 270/291] Add pull-to-refresh functionality

---
 src/app/_layout.tsx                   | 20 +++++--
 src/screens/CheckoutScreen.tsx        | 43 +++++++-------
 src/screens/InProgressOrderScreen.tsx | 81 ++++++++++++++++-----------
 3 files changed, 84 insertions(+), 60 deletions(-)

diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 4cfffd9..7198700 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -172,12 +172,24 @@ export default function RootLayout() {
           />
           <Stack.Screen
             name="checkout"
-            options={{
+            options={({ navigation }) => ({
               headerTitle: '',
               headerTransparent: true,
-              headerLeft: undefined,
-              headerShown: false,
-            }}
+              headerShown: true,
+              headerLeft: () => (
+                <TouchableOpacity
+                  onPress={() => navigation.goBack()}
+                  style={{
+                    padding: 12,
+                    marginLeft: -12,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                  }}
+                >
+                  <ChevronLeftIcon width={28} height={28} color="#000" />
+                </TouchableOpacity>
+              ),
+            })}
           />
           <Stack.Screen
             name="in-progress-order"
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index 20fc18c..f14c8af 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -3,15 +3,11 @@ import {
   View,
   StyleSheet,
   ScrollView,
-  TouchableOpacity,
   Animated,
   BackHandler,
+  RefreshControl,
 } from 'react-native';
-import {
-  ShoppingBagIcon,
-  TruckIcon,
-  ChevronLeftIcon,
-} from 'react-native-heroicons/outline';
+import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
@@ -32,7 +28,6 @@ import Popup from '../components/Popup';
 import EmailVerificationModal from './tab/EmailVerificationModal';
 import { RootState, AppDispatch } from '../redux/store';
 import {
-  setStep,
   setOption,
   setPayment,
   setLocationId,
@@ -208,19 +203,6 @@ const CheckoutScreen = () => {
     }
   };
 
-  const handleGoBack = () => {
-    if (step === stepsLabels.length) {
-      // Si estamos en el último paso, no permitir retroceder
-      return;
-    }
-
-    if (step === 1) {
-      router.back();
-    } else if (step > 1) {
-      dispatch(setStep(step - 1));
-    }
-  };
-
   //const handleOpenMapModal = () => {
   //if (selectedBranch) {
   //  setModalVisible(true); // Open the modal only if a branch is selected
@@ -244,6 +226,17 @@ const CheckoutScreen = () => {
     dispatch(setCouponApplied(true));
   };
 
+  const [refreshing, setRefreshing] = useState(false); // <-- Agregado
+
+  const onRefresh = React.useCallback(() => {
+    setRefreshing(true);
+    // Aquí puedes recargar datos del carrito, usuario, etc.
+    // Simulación de recarga:
+    setTimeout(() => {
+      setRefreshing(false);
+    }, 1000);
+  }, []);
+
   return (
     <>
       <Popup
@@ -269,12 +262,14 @@ const CheckoutScreen = () => {
         visible={emailVerificationModalVisible}
         onClose={() => setEmailVerificationModalVisible(false)} // Close the modal
       />
-      <ScrollView contentContainerStyle={styles.scrollContainer}>
+      <ScrollView
+        contentContainerStyle={styles.scrollContainer}
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+      >
         <View style={styles.container}>
           {/* Solo mostrar el step 1 */}
-          <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-            <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
-          </TouchableOpacity>
           <View style={styles.steps}>
             <Animated.View style={{ opacity: 1 }}>
               <Steps
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 35ac238..96f4f8e 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -1,5 +1,5 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, ScrollView } from 'react-native';
+import { View, StyleSheet, ScrollView, RefreshControl } from 'react-native';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import PaymentInfoForm from '../components/PaymentInfoForm';
 import OrderSummary from '../components/OrderSummary';
@@ -49,9 +49,44 @@ const InProgressOrderScreen = () => {
   const [documentNumber, setDocumentNumber] = useState('');
   const [phoneNumber, setPhoneNumber] = useState('');
   const [backendResponse, setBackendResponse] = useState<string | null>(null);
+  const [refreshing, setRefreshing] = useState<boolean>(false);
   const router = useRouter();
   const dispatch = useDispatch();
 
+  // Extrae la lógica de obtención de la orden
+  const fetchOrder = async () => {
+    if (!orderNumber) return;
+    try {
+      const sdk = PharmaTech.getInstance();
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        console.error('No JWT found in SecureStore');
+        return;
+      }
+      const orderData = await sdk.order.getById(orderNumber as string, jwt);
+      setOrder(orderData);
+
+      // Solo cambia a step 2 si status es 'approved' y paymentMethod es BANK_TRANSFER o MOBILE_PAYMENT
+      if (
+        orderData &&
+        orderData.status &&
+        orderData.status.toLowerCase() === 'approved' &&
+        orderData.paymentMethod &&
+        ['BANK_TRANSFER', 'MOBILE_PAYMENT'].includes(
+          orderData.paymentMethod.toUpperCase(),
+        )
+      ) {
+        setStep(2);
+        return;
+      }
+      setStep(3);
+    } catch (error) {
+      console.error('Error fetching order:', error);
+    } finally {
+      setRefreshing(false);
+    }
+  };
+
   useEffect(() => {
     const fetchUserName = async () => {
       const response = await UserService.getProfile();
@@ -63,36 +98,6 @@ const InProgressOrderScreen = () => {
   }, []);
 
   useEffect(() => {
-    const fetchOrder = async () => {
-      if (!orderNumber) return;
-      try {
-        const sdk = PharmaTech.getInstance();
-        const jwt = await SecureStore.getItemAsync('auth_token');
-        if (!jwt) {
-          console.error('No JWT found in SecureStore');
-          return;
-        }
-        const orderData = await sdk.order.getById(orderNumber as string, jwt);
-        setOrder(orderData);
-
-        // Solo cambia a step 2 si status es 'approved' y paymentMethod es BANK_TRANSFER o MOBILE_PAYMENT
-        if (
-          orderData &&
-          orderData.status &&
-          orderData.status.toLowerCase() === 'approved' &&
-          orderData.paymentMethod &&
-          ['BANK_TRANSFER', 'MOBILE_PAYMENT'].includes(
-            orderData.paymentMethod.toUpperCase(),
-          )
-        ) {
-          setStep(2);
-          return;
-        }
-        setStep(3);
-      } catch (error) {
-        console.error('Error fetching order:', error);
-      }
-    };
     fetchOrder();
   }, [orderNumber]);
 
@@ -143,6 +148,12 @@ const InProgressOrderScreen = () => {
     });
   };
 
+  // Handler para pull-to-refresh
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchOrder();
+  };
+
   return (
     <>
       {/* Alerta para mostrar la respuesta del backend */}
@@ -163,7 +174,13 @@ const InProgressOrderScreen = () => {
       )}
       <ScrollView
         contentContainerStyle={styles.scrollContainer}
-        // Elimina cualquier lógica condicional de justifyContent aquí
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={[Colors.primary]}
+          />
+        }
       >
         <View style={styles.container}>
           <View style={styles.steps}>

From bd39dca1c2da94f113bc661fc84ecfa70854cc4e Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 29 May 2025 13:01:56 -0400
Subject: [PATCH 271/291] Refactor notifications handling in TopBar and
 HomeScreen components to refreshing

---
 src/components/TopBar.tsx      |   3 +-
 src/hooks/useNotifications.ts  | 136 +++++++++++++++------------------
 src/screens/tab/HomeScreen.tsx |  31 +++++++-
 3 files changed, 91 insertions(+), 79 deletions(-)

diff --git a/src/components/TopBar.tsx b/src/components/TopBar.tsx
index c12b78b..e4a4ae0 100644
--- a/src/components/TopBar.tsx
+++ b/src/components/TopBar.tsx
@@ -23,8 +23,7 @@ const TopBar = () => {
     useState(false);
   const router = useRouter();
   const { cartItems } = useCart();
-  const { notifications } = useNotifications();
-  const unreadCount = notifications.filter((n) => !n.isRead).length;
+  const { unreadCount } = useNotifications();
 
   // Calculate the total quantity of items in the cart
   const totalCartQuantity = cartItems.reduce(
diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index 3e60b77..c4a31f3 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -5,12 +5,13 @@ import React, {
   useState,
   ReactNode,
   useCallback,
+  useMemo,
 } from 'react';
 import { NotificationService } from '../services/notifications';
 import { NotificationResponse } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
 import { getUserIdFromSecureStore } from '../helper/jwtHelper';
-import EventSource, { EventSourceListener } from 'react-native-sse';
+import EventSource from 'react-native-sse';
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
 
@@ -18,6 +19,8 @@ export type Notification = NotificationResponse & { isRead: boolean };
 
 export type NotificationsContextType = {
   notifications: Notification[];
+  totalCount: number;
+  unreadCount: number;
   markAsRead: (notificationId: string) => Promise<void>;
   markAsUnread: (notificationId: string) => Promise<void>;
   refreshNotifications: () => Promise<void>;
@@ -33,8 +36,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   const refreshNotifications = useCallback(async (): Promise<void> => {
     try {
       const token = await getUserIdFromSecureStore();
-      if (!token)
-        throw new Error('No se pudo obtener el token de autenticación.');
+      if (!token) throw new Error('No se pudo obtener el token.');
 
       const response: ServiceResponse<
         NotificationResponse | NotificationResponse[]
@@ -45,12 +47,12 @@ export function NotificationsProvider(props: { children: ReactNode }) {
           ? response.data
           : [response.data];
 
-        setNotifications(
-          rawArray.map((n: NotificationResponse) => ({
-            ...n,
-            isRead: Boolean(n.isRead),
-          })),
-        );
+        const mapped = rawArray.map((n) => ({
+          ...n,
+          isRead: Boolean(n.isRead),
+        }));
+        console.log('Notificaciones recibidas:', mapped);
+        setNotifications(mapped);
       } else {
         console.error('Error cargando notificaciones:', response);
       }
@@ -62,10 +64,9 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   const markAsRead = useCallback(async (notificationId: string) => {
     try {
       const token = await getUserIdFromSecureStore();
-      if (!token)
-        throw new Error('No se pudo obtener el token de autenticación.');
-
+      if (!token) throw new Error('No se pudo obtener el token.');
       await NotificationService.markAsRead(notificationId, token);
+      // optimismo: actualizamos localmente
       setNotifications((prev) =>
         prev.map((n) => (n.id === notificationId ? { ...n, isRead: true } : n)),
       );
@@ -78,74 +79,52 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   }, []);
 
   const markAsUnread = useCallback(async (notificationId: string) => {
-    try {
-      // Si la API soporta 'unread', aquí iría NotificationService.markAsUnread(...)
-      setNotifications((prev) =>
-        prev.map((n) =>
-          n.id === notificationId ? { ...n, isRead: false } : n,
-        ),
-      );
-    } catch (err) {
-      console.error(
-        `Error marcando notificación ${notificationId} como no leída:`,
-        err,
-      );
-    }
+    // si tu API no ofrece un endpoint "unread", lo simulamos localmente
+    setNotifications((prev) =>
+      prev.map((n) => (n.id === notificationId ? { ...n, isRead: false } : n)),
+    );
   }, []);
 
-  // SSE: Real-time notifications
+  // Conteos derivados
+  const totalCount = notifications.length;
+  const unreadCount = useMemo(
+    () => notifications.filter((n) => !n.isRead).length,
+    [notifications],
+  );
+
   useEffect(() => {
     let es: EventSource | null = null;
 
     async function setupSSE() {
-      try {
-        const token = await SecureStore.getItemAsync('auth_token');
-        if (!token) return;
-
-        // Usa el api de sdkConfig para obtener el cliente y baseURL
-        const axiosClient = api.client['client'];
-        const baseURL: string | undefined = axiosClient?.getUri
-          ? axiosClient.getUri({ url: '' })
-          : axiosClient?.defaults?.baseURL;
-        if (!baseURL) return;
-
-        const url = `${baseURL.replace(/\/$/, '')}/notification/stream`;
-
-        es = new EventSource(url, {
-          headers: {
-            Authorization: `Bearer ${token}`,
-          },
-          lineEndingCharacter: '\n',
-        });
-
-        const listener: EventSourceListener = (event) => {
-          console.log('Evento SSE recibido:', event.type);
-          if (event.type === 'open') {
-            console.log('Conexión SSE abierta');
-          } else if (event.type === 'message') {
-            console.log('[SSE] Tipo: message');
-            console.log('[SSE] Event object:', event);
-            console.log('[SSE] Raw data:', event.data);
-            if (typeof event.data === 'string') {
-              const notif = JSON.parse(event.data) as NotificationResponse;
-              console.log('[SSE] Parsed notification:', notif);
-              setNotifications((prev) => {
-                void refreshNotifications();
-                if (prev.some((n) => n.id === notif.id)) return prev;
-                return [{ ...notif, isRead: Boolean(notif.isRead) }, ...prev];
-              });
-            }
-          } else if (event.type === 'error') {
-            console.error('Error SSE:', event);
-          }
-        };
-
-        es.addEventListener('open', listener);
-        es.addEventListener('message', listener);
-        es.addEventListener('error', listener);
-      } catch (err) {
-        console.error('Error inicializando SSE para notificaciones:', err);
-      }
+      // 1) carga inicial
+      await refreshNotifications();
+
+      // 2) stream SSE
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) return;
+
+      const axiosClient = api.client['client'];
+      const baseURL: string | undefined = axiosClient.getUri
+        ? axiosClient.getUri({ url: '' })
+        : axiosClient.defaults.baseURL;
+      if (!baseURL) return;
+
+      const url = `${baseURL.replace(/\/$/, '')}/notification/stream`;
+
+      es = new EventSource(url, {
+        headers: { Authorization: `Bearer ${token}` },
+        lineEndingCharacter: '\n',
+      });
+
+      // Cada vez que llegue un mensaje, recargamos TODO el listado:
+      es.addEventListener('message', () => {
+        console.log('[SSE] mensaje recibido → refrescando notificaciones');
+        void refreshNotifications();
+      });
+
+      es.addEventListener('error', (err) => {
+        console.error('[SSE] error:', err);
+      });
     }
 
     setupSSE();
@@ -161,7 +140,14 @@ export function NotificationsProvider(props: { children: ReactNode }) {
   return React.createElement(
     NotificationsContext.Provider,
     {
-      value: { notifications, markAsRead, markAsUnread, refreshNotifications },
+      value: {
+        notifications,
+        totalCount,
+        unreadCount,
+        markAsRead,
+        markAsUnread,
+        refreshNotifications,
+      },
     },
     props.children,
   );
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index ad91bf1..6c40d93 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  RefreshControl,
+} from 'react-native';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import * as SecureStore from 'expo-secure-store';
 import { useCart } from '../../hooks/useCart';
@@ -10,6 +16,7 @@ import { ProductService } from '../../services/products';
 import { Product } from '../../types/Product';
 import EmailVerificationModal from './EmailVerificationModal';
 import { decodeJWT } from '../../helper/jwtHelper';
+import { useNotifications } from '../../hooks/useNotifications';
 
 export default function HomeScreen() {
   const [products, setProducts] = useState<Product[]>([]);
@@ -17,10 +24,12 @@ export default function HomeScreen() {
   const [loading, setLoading] = useState(true);
   const [loadingRecommendations, setLoadingRecommendations] = useState(true);
   const [showEmailVerification, setShowEmailVerification] = useState(false);
+  const [refreshing, setRefreshing] = useState(false);
   const router = useRouter();
   const { showEmailVerification: showEmailVerificationParam } =
     useLocalSearchParams();
   const { cartItems, addToCart, updateCartQuantity, setCartUserId } = useCart();
+  const { refreshNotifications } = useNotifications();
 
   const getItemQuantity = (productId: string) => {
     const cartItem = cartItems.find((item) => item.id === productId.toString());
@@ -162,9 +171,27 @@ export default function HomeScreen() {
     }
   };
 
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await Promise.all([
+      obtainProducts(),
+      obtainRecommendedProducts(),
+      refreshNotifications(), // <-- refresca notificaciones también
+    ]);
+    setRefreshing(false);
+  };
+
   return (
     <View testID="home-screen" style={styles.container}>
-      <ScrollView>
+      <ScrollView
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={[Colors.primary]}
+          />
+        }
+      >
         <View>
           <PoppinsText weight="medium" style={styles.title}>
             Ofertas especiales

From 15e102b414417f4d178fe6a7a319ce87da010f81 Mon Sep 17 00:00:00 2001
From: Mvjtb <1001.25854794.ucla@gmail.com>
Date: Thu, 29 May 2025 13:12:52 -0400
Subject: [PATCH 272/291] Add loading indicator for payment processing in
 InProgressOrderScreen

---
 src/screens/InProgressOrderScreen.tsx | 66 ++++++++++++++++++---------
 1 file changed, 45 insertions(+), 21 deletions(-)

diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
index 96f4f8e..cebbf75 100644
--- a/src/screens/InProgressOrderScreen.tsx
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useState, useEffect } from 'react';
-import { View, StyleSheet, ScrollView, RefreshControl } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  RefreshControl,
+  ActivityIndicator,
+} from 'react-native';
 import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import PaymentInfoForm from '../components/PaymentInfoForm';
 import OrderSummary from '../components/OrderSummary';
@@ -50,6 +56,7 @@ const InProgressOrderScreen = () => {
   const [phoneNumber, setPhoneNumber] = useState('');
   const [backendResponse, setBackendResponse] = useState<string | null>(null);
   const [refreshing, setRefreshing] = useState<boolean>(false);
+  const [isSubmittingPayment, setIsSubmittingPayment] = useState(false);
   const router = useRouter();
   const dispatch = useDispatch();
 
@@ -113,6 +120,7 @@ const InProgressOrderScreen = () => {
           setOrder((prev) =>
             prev ? { ...prev, status: data.status as OrderStatus } : prev,
           );
+          setIsSubmittingPayment(false); // <-- Oculta el loader cuando llega el update
         }
       });
     };
@@ -207,24 +215,33 @@ const InProgressOrderScreen = () => {
                   Visualización de datos
                 </PoppinsText>
                 <View style={styles.paymentInfoFormContainer}>
-                  <PaymentInfoForm
-                    paymentMethod={
-                      order.paymentMethod
-                        ? (order.paymentMethod.toUpperCase() as
-                            | 'CARD'
-                            | 'CASH'
-                            | 'BANK_TRANSFER'
-                            | 'MOBILE_PAYMENT'
-                            | null)
-                        : null
-                    }
-                    total={order.totalPrice ? String(order.totalPrice) : ''}
-                    onValidationChange={setPaymentFormValid}
-                    onBankChange={setBank}
-                    onReferenceChange={setReference}
-                    onDocumentNumberChange={setDocumentNumber}
-                    onPhoneChange={setPhoneNumber}
-                  />
+                  {isSubmittingPayment ? (
+                    <View style={styles.loaderContainer}>
+                      <ActivityIndicator size="large" color={Colors.primary} />
+                      <PoppinsText style={{ marginTop: 16 }}>
+                        Procesando pago...
+                      </PoppinsText>
+                    </View>
+                  ) : (
+                    <PaymentInfoForm
+                      paymentMethod={
+                        order.paymentMethod
+                          ? (order.paymentMethod.toUpperCase() as
+                              | 'CARD'
+                              | 'CASH'
+                              | 'BANK_TRANSFER'
+                              | 'MOBILE_PAYMENT'
+                              | null)
+                          : null
+                      }
+                      total={order.totalPrice ? String(order.totalPrice) : ''}
+                      onValidationChange={setPaymentFormValid}
+                      onBankChange={setBank}
+                      onReferenceChange={setReference}
+                      onDocumentNumberChange={setDocumentNumber}
+                      onPhoneChange={setPhoneNumber}
+                    />
+                  )}
                 </View>
                 <View style={styles.whiteBackgroundContainer}>
                   <OrderSummary />
@@ -249,12 +266,14 @@ const InProgressOrderScreen = () => {
                           setShowValidationPopup(true);
                           return;
                         }
+                        setIsSubmittingPayment(true); // <-- Muestra loader
                         try {
                           const sdk = PharmaTech.getInstance();
                           const jwt =
                             await SecureStore.getItemAsync('auth_token');
                           if (!jwt) {
                             setBackendResponse('No JWT found en SecureStore');
+                            setIsSubmittingPayment(false);
                             return;
                           }
                           const paymentConfirmation: PaymentConfirmation = {
@@ -268,13 +287,12 @@ const InProgressOrderScreen = () => {
                             paymentConfirmation,
                             jwt,
                           );
-                          // Puedes ajustar el mensaje según la estructura real de la respuesta
                           setBackendResponse(
                             response && response.id
                               ? '¡Pago enviado correctamente!'
                               : 'Respuesta recibida del servidor.',
                           );
-                          setStep(3);
+                          // NO cambies el step aquí, espera al socket
                         } catch (error: unknown) {
                           let errorMessage =
                             'Error enviando confirmación de pago. Intenta nuevamente.';
@@ -293,6 +311,7 @@ const InProgressOrderScreen = () => {
                             errorMessage = error.message;
                           }
                           setBackendResponse(errorMessage);
+                          setIsSubmittingPayment(false); // Oculta loader si hay error
                         }
                       }}
                     />
@@ -434,6 +453,11 @@ const styles = StyleSheet.create({
     marginTop: 24,
     width: '100%',
   },
+  loaderContainer: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingVertical: 40,
+  },
 });
 
 export default InProgressOrderScreen;

From 74740a61a194135aa7fa1d33f9708ba4c871e516 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 13:16:15 -0400
Subject: [PATCH 273/291] Update @pharmatech/sdk to version 0.4.21 and enhance
 OrderTrackingScreen with refresh functionality and step tracking

---
 package-lock.json                   |  8 +--
 package.json                        |  2 +-
 src/components/VerticalStepper.tsx  |  4 +-
 src/screens/OrderTrackingScreen.tsx | 98 ++++++++++++++++++++---------
 4 files changed, 74 insertions(+), 38 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b5246b..013f241 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.19",
+        "@pharmatech/sdk": "^0.4.21",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,9 +3592,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
-      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.21.tgz",
+      "integrity": "sha512-fxyXlgKN3qLxuGVg6bmRS5DhqfLOLsCYazffax5x0iYFFBIQHQBVRLltm5h84jvOEM0oA7ipD08VVXWMyBj/vQ==",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index 6475559..b61baa4 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.19",
+    "@pharmatech/sdk": "^0.4.21",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/components/VerticalStepper.tsx b/src/components/VerticalStepper.tsx
index 2c983ab..b770eb7 100644
--- a/src/components/VerticalStepper.tsx
+++ b/src/components/VerticalStepper.tsx
@@ -18,8 +18,8 @@ const VerticalStepper: React.FC<VerticalStepperProps> = ({
   return (
     <View style={styles.container}>
       {steps.map((step, index) => {
-        const isCompleted = index < currentStep;
-        const isActive = index === currentStep;
+        const isCompleted = index < currentStep - 1;
+        const isActive = index === currentStep - 1;
 
         return (
           <View key={index} style={styles.stepContainer}>
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index e219861..ace7010 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, ActivityIndicator } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  ActivityIndicator,
+  RefreshControl,
+} from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useLocalSearchParams } from 'expo-router';
@@ -32,26 +38,50 @@ const OrderTrackingScreen = () => {
   const [showErrorAlert, setShowErrorAlert] = useState(false);
   const [showSuccessAlert, setShowSuccessAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
-  const [orderStatus, setOrderStatus] = useState('');
+  const [step, setStep] = useState(0);
+  const [refreshing, setRefreshing] = useState<boolean>(false);
 
-  useEffect(() => {
-    const fetchOrder = async () => {
-      try {
-        const order = await UserService.getOrder(id);
-        console.log(order);
-        if (order.success) {
-          setOrder(order.data);
-        }
-      } catch (error) {
-        console.log(error);
-        setErrorMessage('Ocurrió un error');
-        setShowErrorAlert(true);
-      } finally {
-        setLoading(false);
+  const changeTrackingStatus = (status: OrderStatus) => {
+    switch (status) {
+      case OrderStatus.REQUESTED:
+      case OrderStatus.CANCELED:
+        setStep(0);
+        break;
+      case OrderStatus.APPROVED:
+        setStep(1);
+        break;
+      case OrderStatus.IN_PROGRESS:
+      case OrderStatus.READY_FOR_PICKUP:
+        setStep(2);
+        break;
+      case OrderStatus.COMPLETED:
+        setStep(3);
+        break;
+      default:
+        setStep(0);
+        break;
+    }
+  };
+
+  const fetchOrder = async () => {
+    try {
+      const order = await UserService.getOrder(id);
+      console.log(order);
+      if (order.success) {
+        setOrder(order.data);
+        changeTrackingStatus(order.data.status);
       }
-    };
-    fetchOrder();
+    } catch (error) {
+      console.log(error);
+      setErrorMessage('Ocurrió un error');
+      setShowErrorAlert(true);
+    } finally {
+      setLoading(false);
+      setRefreshing(false);
+    }
+  };
 
+  useEffect(() => {
     if (id) {
       fetchOrder();
 
@@ -68,8 +98,9 @@ const OrderTrackingScreen = () => {
       });
 
       function onOrderUpdated(order: { orderId: string; status: OrderStatus }) {
-        setOrderStatus(order.status);
-        console.log('Estado de la orrrrdennnn: ', order.status);
+        if (order.orderId === id) {
+          changeTrackingStatus(order.status);
+        }
       }
 
       socket.connect();
@@ -90,14 +121,6 @@ const OrderTrackingScreen = () => {
         socket.off('orderUpdated', onOrderUpdated);
         socket.disconnect();
       };
-
-      /* sss
-      socket.on('connect', onConnect);
-      socket.on('disconnect', onDisconnect);
-      return () => {
-        //socket.off('connect', onConnect);
-        //socket.off('disconnect', onDisconnect);
-      }; */
     }
   }, []);
 
@@ -109,6 +132,11 @@ const OrderTrackingScreen = () => {
     );
   }
 
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchOrder();
+  };
+
   const dateFormat: Intl.DateTimeFormatOptions = {
     day: '2-digit',
     month: 'long',
@@ -150,7 +178,16 @@ const OrderTrackingScreen = () => {
   ];
 
   return (
-    <ScrollView contentContainerStyle={styles.container}>
+    <ScrollView
+      contentContainerStyle={styles.container}
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={onRefresh}
+          colors={[Colors.primary]}
+        />
+      }
+    >
       <View style={styles.alertContainer}>
         {showErrorAlert && (
           <Alert
@@ -229,9 +266,8 @@ const OrderTrackingScreen = () => {
               </>
             )}
           </View>
-          <PoppinsText>{orderStatus}</PoppinsText>
           <View style={{ marginVertical: 20 }}>
-            <VerticalStepper steps={steps} currentStep={0} />
+            <VerticalStepper steps={steps} currentStep={step} />
           </View>
           <View>
             <View

From 012d171292094d0df122d13e0979ad02f450d169 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 14:58:18 -0400
Subject: [PATCH 274/291] Adapting to latest sdk

---
 package-lock.json | 9 +++++----
 package.json      | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4b5246b..aa1a182 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.19",
+        "@pharmatech/sdk": "^0.4.21",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,9 +3592,10 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
-      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.21.tgz",
+      "integrity": "sha512-fxyXlgKN3qLxuGVg6bmRS5DhqfLOLsCYazffax5x0iYFFBIQHQBVRLltm5h84jvOEM0oA7ipD08VVXWMyBj/vQ==",
+      "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
       }
diff --git a/package.json b/package.json
index bd58b0d..1cd1ff6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.19",
+    "@pharmatech/sdk": "^0.4.21",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",

From a2435fb2b540be2ae4ad4502e75f527ce1dde61e Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 15:28:10 -0400
Subject: [PATCH 275/291] Add refresh functionality to ActiveOrdersScreen and
 update OrderTrackingScreen to handle delivery status

---
 src/screens/ActiveOrdersScreen.tsx  | 69 +++++++++++++++++++----------
 src/screens/OrderTrackingScreen.tsx | 43 ++++++++++--------
 2 files changed, 70 insertions(+), 42 deletions(-)

diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 35f2918..42c9e0e 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -1,5 +1,11 @@
 import React, { useEffect, useState } from 'react';
-import { View, StyleSheet, ScrollView, TouchableOpacity } from 'react-native';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  TouchableOpacity,
+  RefreshControl,
+} from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useRouter } from 'expo-router';
@@ -30,37 +36,52 @@ const ActiveOrdersScreen = () => {
   const [showInfoAlert, setShowInfoAlert] = useState(false);
   const [errorMessage, setErrorMessage] = useState('');
   const router = useRouter();
+  const [refreshing, setRefreshing] = useState<boolean>(false);
 
-  useEffect(() => {
-    const fetchActiveOrders = async () => {
-      try {
-        const order = await UserService.getUserOrders();
-        if (order.success) {
-          const activeOrders = order.data.results.filter(
-            (o) =>
-              o.status === 'requested' ||
-              o.status === 'approved' ||
-              o.status === 'ready_for_pickup' ||
-              o.status === 'in_progress',
-          );
-          if (activeOrders.length > 0) {
-            setActiveOrdersList(activeOrders);
-          } else {
-            setShowInfoAlert(true);
-          }
+  const fetchActiveOrders = async () => {
+    try {
+      const order = await UserService.getUserOrders();
+      if (order.success) {
+        const activeOrders = order.data.results.filter(
+          (o) =>
+            o.status === 'requested' ||
+            o.status === 'approved' ||
+            o.status === 'ready_for_pickup' ||
+            o.status === 'in_progress',
+        );
+        if (activeOrders.length > 0) {
+          setActiveOrdersList(activeOrders);
+        } else {
+          setShowInfoAlert(true);
         }
-      } catch (error) {
-        console.log(error);
-        setErrorMessage('Ha ocurrido un error');
-        setShowErrorAlert(true);
       }
-    };
+    } catch (error) {
+      console.log(error);
+      setErrorMessage('Ha ocurrido un error');
+      setShowErrorAlert(true);
+    }
+  };
 
+  useEffect(() => {
     fetchActiveOrders();
   }, []);
 
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchActiveOrders();
+  };
+
   return (
-    <ScrollView contentContainerStyle={styles.container}>
+    <ScrollView
+      contentContainerStyle={styles.container}
+      refreshControl={
+        <RefreshControl
+          refreshing={refreshing}
+          onRefresh={onRefresh}
+          colors={[Colors.primary]}
+        />
+      }
+    >
       <View style={styles.alertContainer}>
         {showErrorAlert && (
           <Alert
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index ace7010..97b27af 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -10,7 +10,11 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useLocalSearchParams } from 'expo-router';
 import Alert from '../components/Alerts';
-import { OrderDetailedResponse, OrderStatus } from '@pharmatech/sdk';
+import {
+  OrderDeliveryStatus,
+  OrderDetailedResponse,
+  OrderStatus,
+} from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
 import * as SecureStore from 'expo-secure-store';
@@ -27,6 +31,7 @@ import {
 import io from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
 import VerticalStepper from '../components/VerticalStepper';
+import { DeliveryService } from '../services/delivery';
 
 const OrderTrackingScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -40,6 +45,7 @@ const OrderTrackingScreen = () => {
   const [errorMessage, setErrorMessage] = useState('');
   const [step, setStep] = useState(0);
   const [refreshing, setRefreshing] = useState<boolean>(false);
+  const [userAddress, setUserAddress] = useState('');
 
   const changeTrackingStatus = (status: OrderStatus) => {
     switch (status) {
@@ -68,6 +74,19 @@ const OrderTrackingScreen = () => {
       const order = await UserService.getOrder(id);
       console.log(order);
       if (order.success) {
+        if (
+          order.data.orderDeliveries &&
+          order.data.orderDeliveries.length > 0 &&
+          order.data.orderDeliveries[0].deliveryStatus ===
+            OrderDeliveryStatus.ASSIGNED
+        ) {
+          const delivery = await DeliveryService.getOrderDetails(
+            order.data.orderDeliveries[0].id,
+          );
+          setUserAddress(
+            delivery.address.adress + '. \n' + delivery.address.referencePoint,
+          );
+        }
         setOrder(order.data);
         changeTrackingStatus(order.data.status);
       }
@@ -149,30 +168,21 @@ const OrderTrackingScreen = () => {
     {
       title: 'Orden Confirmada',
       description: order?.orderDeliveries
-        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
-            'es-ES',
-            dateFormat,
-          )
+        ? new Date(order?.updatedAt).toLocaleString('es-ES', dateFormat)
         : '',
     },
     {
       title:
         order?.type === 'delivery' ? 'Repartidor en camino' : 'En preparación',
       description: order?.orderDeliveries
-        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
-            'es-ES',
-            dateFormat,
-          )
+        ? new Date(order?.updatedAt).toLocaleString('es-ES', dateFormat)
         : '',
     },
     {
       title:
         order?.type === 'delivery' ? 'Pedido entregado' : 'Listo para recoger',
       description: order?.orderDeliveries
-        ? new Date(order?.orderDeliveries[0]?.createdAt).toLocaleString(
-            'es-ES',
-            dateFormat,
-          )
+        ? new Date(order?.updatedAt).toLocaleString('es-ES', dateFormat)
         : '',
     },
   ];
@@ -253,9 +263,7 @@ const OrderTrackingScreen = () => {
                 <CubeIcon color={Colors.semanticSuccess} />
                 <PoppinsText style={{ color: Colors.semanticSuccess }}>
                   Pickup:{' '}
-                  {new Date(
-                    order?.orderDeliveries[0]?.estimatedTime,
-                  ).toLocaleString('es-ES', {
+                  {new Date(order?.updatedAt).toLocaleString('es-ES', {
                     day: '2-digit',
                     month: 'long',
                     hour: '2-digit',
@@ -302,8 +310,7 @@ const OrderTrackingScreen = () => {
                       <PoppinsText style={{ marginBottom: 10 }}>
                         Dirección de Entrega:
                       </PoppinsText>
-                      <PoppinsText>{order?.branch?.address}.</PoppinsText>
-                      <PoppinsText>{order?.branch?.city.name}</PoppinsText>
+                      <PoppinsText>{userAddress}</PoppinsText>
                     </View>
                   </View>
                   <View

From 068e79807f67b7c79d0a5a889a0bf570dce0c1b0 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 15:50:08 -0400
Subject: [PATCH 276/291] Update delivery status check in OrderTrackingScreen
 from ASSIGNED to TO_ASSIGN

---
 src/screens/OrderTrackingScreen.tsx | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index 97b27af..5dc9cef 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -78,7 +78,7 @@ const OrderTrackingScreen = () => {
           order.data.orderDeliveries &&
           order.data.orderDeliveries.length > 0 &&
           order.data.orderDeliveries[0].deliveryStatus ===
-            OrderDeliveryStatus.ASSIGNED
+            OrderDeliveryStatus.TO_ASSIGN
         ) {
           const delivery = await DeliveryService.getOrderDetails(
             order.data.orderDeliveries[0].id,

From d68e0bb474127fa10d69ee80dd16761508b4c011 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 16:16:33 -0400
Subject: [PATCH 277/291] Refactor delivery status check in OrderTrackingScreen
 to simplify condition

---
 src/screens/OrderTrackingScreen.tsx | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index 5dc9cef..c4f408f 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -10,11 +10,7 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useLocalSearchParams } from 'expo-router';
 import Alert from '../components/Alerts';
-import {
-  OrderDeliveryStatus,
-  OrderDetailedResponse,
-  OrderStatus,
-} from '@pharmatech/sdk';
+import { OrderDetailedResponse, OrderStatus } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
 import * as SecureStore from 'expo-secure-store';
@@ -76,9 +72,7 @@ const OrderTrackingScreen = () => {
       if (order.success) {
         if (
           order.data.orderDeliveries &&
-          order.data.orderDeliveries.length > 0 &&
-          order.data.orderDeliveries[0].deliveryStatus ===
-            OrderDeliveryStatus.TO_ASSIGN
+          order.data.orderDeliveries.length > 0
         ) {
           const delivery = await DeliveryService.getOrderDetails(
             order.data.orderDeliveries[0].id,

From b21c6481e4f682f6dc107214f75affd65d6442a7 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 16:42:54 -0400
Subject: [PATCH 278/291] Fixing more prices to work with cents

---
 src/components/OrderSummary.tsx | 13 +++++++------
 src/components/SearchInput.tsx  |  3 ++-
 src/screens/CheckoutScreen.tsx  | 21 ++++++++++++++-------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 45e56f4..5b441a0 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -5,6 +5,7 @@ import PoppinsText from './PoppinsText';
 import { Colors, FontSizes } from '../styles/theme';
 import type { CartItem } from '../redux/slices/cartSlice';
 import { ChevronDownIcon, ChevronUpIcon } from 'react-native-heroicons/outline';
+import { formatPrice } from '../utils/formatPrice';
 
 const OrderSummary = () => {
   const { cartItems } = useCart();
@@ -47,14 +48,14 @@ const OrderSummary = () => {
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <PoppinsText style={styles.productTotalPrice}>
-              ${totalDiscountedPrice.toFixed(2)}
+              ${formatPrice(totalDiscountedPrice)}
             </PoppinsText>
           </View>
           <PoppinsText style={styles.productOriginalPrice}>
-            ${totalOriginalPrice.toFixed(2)}
+            ${formatPrice(totalOriginalPrice)}
           </PoppinsText>
           <PoppinsText style={styles.productPrice}>
-            (${discountedPrice.toFixed(2)} c/u)
+            (${formatPrice(discountedPrice)} c/u)
           </PoppinsText>
           <PoppinsText style={styles.productQuantity}>
             Cantidad: {item.quantity}
@@ -104,19 +105,19 @@ const OrderSummary = () => {
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
               <PoppinsText style={styles.subtotalText}>
-                ${subtotal.toFixed(2)}
+                ${formatPrice(subtotal)}
               </PoppinsText>
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
               <PoppinsText style={styles.discountText}>
-                -${totalDiscount.toFixed(2)}
+                -${formatPrice(totalDiscount)}
               </PoppinsText>
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Total</PoppinsText>
               <PoppinsText style={styles.subtotalText}>
-                ${total.toFixed(2)}
+                ${formatPrice(total)}
               </PoppinsText>
             </View>
           </View>
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index 63ffa96..20fc96c 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -17,6 +17,7 @@ import PoppinsText from './PoppinsText';
 import { router } from 'expo-router';
 import { ProductService } from '../services/products';
 import { ProductPresentation } from '@pharmatech/sdk';
+import { formatPrice } from '../utils/formatPrice';
 
 interface SearchInputProps {
   placeholder?: string;
@@ -195,7 +196,7 @@ const SearchInput: React.FC<SearchInputProps> = ({
                         color: Colors.primary,
                       }}
                     >
-                      $ {p?.price}
+                      $ {formatPrice(p?.price)}
                     </PoppinsText>
                   </View>
                 </TouchableOpacity>
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index f14c8af..90ad041 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -41,6 +41,7 @@ import {
   CreateOrderDetail,
   PaymentMethod,
 } from '@pharmatech/sdk';
+import { formatPrice } from '../utils/formatPrice';
 
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
@@ -90,16 +91,22 @@ const CheckoutScreen = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  {
-    /** const totalDiscount = cartItems.reduce(
-    (sum, item) => sum + item.price * (item.quantity * 0.1),
+
+  // Calcula el descuento total de los productos (igual que OrderSummary)
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
     0,
-  );*/
-  }
-  const subtotalAfterDiscount = subtotal; // - totalDiscount;
+  );
+
+  // Subtotal después de descuentos de productos
+  const subtotalAfterDiscount = subtotal - totalDiscount;
+
+  // Aplica el cupón sobre el subtotal ya descontado
   const subtotalAfterCoupon = couponApplied
     ? subtotalAfterDiscount * (1 - couponDiscount / 100)
     : subtotalAfterDiscount;
+
   const total = subtotalAfterCoupon;
 
   const renderFooterMessage = () => {
@@ -352,7 +359,7 @@ const CheckoutScreen = () => {
               <View style={styles.totalRow}>
                 <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
                 <PoppinsText style={styles.totalAmount}>
-                  ${total.toFixed(2)}
+                  ${formatPrice(total)}
                 </PoppinsText>
               </View>
             </View>

From 3dfc79b5e8cc61d2ed663f1aa1ede1ad8e07d36f Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 17:22:54 -0400
Subject: [PATCH 279/291] Merge branch 'dev' into fix/General-fixes

---
 package-lock.json                       |   8 +-
 package.json                            |   2 +-
 src/app/_layout.tsx                     |  21 +
 src/app/in-progress-order.tsx           |   3 +
 src/components/Card.tsx                 |  35 +-
 src/components/CardButton.tsx           |   7 +-
 src/components/OrderSummary.tsx         |  51 ++-
 src/components/PaymentInfoForm.tsx      |  46 +-
 src/components/PaymentStatusMessage.tsx |  94 ++++-
 src/components/SearchInput.tsx          |   3 +-
 src/hooks/useCart.ts                    |  20 +-
 src/redux/slices/cartSlice.ts           |  25 +-
 src/screens/CartListScreen.tsx          |  75 ++--
 src/screens/CheckoutScreen.tsx          | 535 ++++++++----------------
 src/screens/InProgressOrderScreen.tsx   | 463 ++++++++++++++++++++
 src/screens/OrdersScreen.tsx            |   3 +-
 src/screens/ProductDetailScreen.tsx     |  80 +++-
 src/screens/tab/HomeScreen.tsx          | 135 +++---
 src/screens/tab/OffersScreen.tsx        | 155 ++++++-
 src/services/order.ts                   |  14 +
 src/services/paymentConfirmation.ts     |   1 +
 src/services/paymentInformation.ts      |   6 +-
 src/types/Product.ts                    |   4 +-
 src/types/api.d.ts                      |   1 +
 src/utils/formatPrice.ts                |   8 +
 25 files changed, 1225 insertions(+), 570 deletions(-)
 create mode 100644 src/app/in-progress-order.tsx
 create mode 100644 src/screens/InProgressOrderScreen.tsx
 create mode 100644 src/utils/formatPrice.ts

diff --git a/package-lock.json b/package-lock.json
index ac7f9d9..aa1a182 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -9,7 +9,7 @@
       "version": "0.2.0",
       "dependencies": {
         "@expo-google-fonts/poppins": "^0.2.3",
-        "@pharmatech/sdk": "^0.4.19",
+        "@pharmatech/sdk": "^0.4.21",
         "@ptomasroos/react-native-multi-slider": "^2.2.2",
         "@react-native-community/slider": "^4.5.6",
         "@reduxjs/toolkit": "^2.6.1",
@@ -3592,9 +3592,9 @@
       }
     },
     "node_modules/@pharmatech/sdk": {
-      "version": "0.4.19",
-      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.19.tgz",
-      "integrity": "sha512-ZiYsoiVRtDjxs5eDqtUAZrEsUWMEZ9+q5XpSOSHt+gTcZLBzntIOO21ZyAm6ONXyRO6EORsOy2vlnnOv87Cs0g==",
+      "version": "0.4.21",
+      "resolved": "https://registry.npmjs.org/@pharmatech/sdk/-/sdk-0.4.21.tgz",
+      "integrity": "sha512-fxyXlgKN3qLxuGVg6bmRS5DhqfLOLsCYazffax5x0iYFFBIQHQBVRLltm5h84jvOEM0oA7ipD08VVXWMyBj/vQ==",
       "license": "MIT",
       "dependencies": {
         "axios": "^1.8.1"
diff --git a/package.json b/package.json
index bd58b0d..1cd1ff6 100644
--- a/package.json
+++ b/package.json
@@ -19,7 +19,7 @@
   },
   "dependencies": {
     "@expo-google-fonts/poppins": "^0.2.3",
-    "@pharmatech/sdk": "^0.4.19",
+    "@pharmatech/sdk": "^0.4.21",
     "@ptomasroos/react-native-multi-slider": "^2.2.2",
     "@react-native-community/slider": "^4.5.6",
     "@reduxjs/toolkit": "^2.6.1",
diff --git a/src/app/_layout.tsx b/src/app/_layout.tsx
index 4aea9df..0440b97 100644
--- a/src/app/_layout.tsx
+++ b/src/app/_layout.tsx
@@ -157,6 +157,27 @@ export default function RootLayout() {
           />
           <Stack.Screen
             name="checkout"
+            options={({ navigation }) => ({
+              headerTitle: '',
+              headerTransparent: true,
+              headerShown: true,
+              headerLeft: () => (
+                <TouchableOpacity
+                  onPress={() => navigation.goBack()}
+                  style={{
+                    padding: 12,
+                    marginLeft: -12,
+                    flexDirection: 'row',
+                    alignItems: 'center',
+                  }}
+                >
+                  <ChevronLeftIcon width={28} height={28} color="#000" />
+                </TouchableOpacity>
+              ),
+            })}
+          />
+          <Stack.Screen
+            name="in-progress-order"
             options={{
               headerTitle: '',
               headerTransparent: true,
diff --git a/src/app/in-progress-order.tsx b/src/app/in-progress-order.tsx
new file mode 100644
index 0000000..746011c
--- /dev/null
+++ b/src/app/in-progress-order.tsx
@@ -0,0 +1,3 @@
+import InProgressOrderScreen from '../screens/InProgressOrderScreen';
+
+export default InProgressOrderScreen;
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
index 4c6a046..8e492cb 100644
--- a/src/components/Card.tsx
+++ b/src/components/Card.tsx
@@ -7,6 +7,7 @@ import { truncateString } from '../utils/commons';
 import { useCart } from '../hooks/useCart';
 import { Product } from '../types/Product';
 import { useRouter } from 'expo-router';
+import { formatPrice } from '../utils/formatPrice';
 
 const ProductCard: React.FC<Product> = ({
   id,
@@ -15,13 +16,17 @@ const ProductCard: React.FC<Product> = ({
   imageUrl,
   name,
   category,
-  //originalPrice,
-  //discount,
+  originalPrice,
+  discount,
   finalPrice,
   getQuantity,
 }) => {
-  const { getItemQuantity, updateCartQuantity } = useCart();
+  const { getItemQuantity, addToCart } = useCart();
   const router = useRouter();
+  const computedFinalPrice = discount
+    ? (finalPrice * (100 - discount)) / 100
+    : finalPrice;
+
   return (
     <TouchableOpacity
       onPress={() =>
@@ -57,7 +62,15 @@ const ProductCard: React.FC<Product> = ({
               <CardButton
                 getValue={(quantity) => {
                   if (getQuantity) getQuantity(quantity);
-                  updateCartQuantity(id, quantity);
+                  // Asegura que price siempre sea number
+                  addToCart({
+                    id,
+                    name,
+                    price: originalPrice ?? 0,
+                    quantity,
+                    image: imageUrl,
+                    discount: discount ?? 0,
+                  });
                 }}
                 initialValue={getItemQuantity(id)}
               />
@@ -66,22 +79,18 @@ const ProductCard: React.FC<Product> = ({
         </View>
         <View style={styles.description}>
           <PoppinsText style={styles.name}>{truncateString(name)}</PoppinsText>
-          {/** 
           {discount && (
             <View style={styles.priceContainer}>
               <PoppinsText style={styles.originalPrice}>
-                ${originalPrice}
+                ${formatPrice(originalPrice ?? 0)}
               </PoppinsText>
-              <PoppinsText style={styles.discount}>{discount}%</PoppinsText> // Comentado 
+              <PoppinsText style={styles.discount}>{discount}%</PoppinsText>
             </View>
-          )}*/}
+          )}
           <PoppinsText
-            style={[
-              styles.finalPrice,
-              //!discount && { color: Colors.semanticInfo },
-            ]}
+            style={[styles.finalPrice, !discount && { color: Colors.textMain }]}
           >
-            ${finalPrice}
+            ${formatPrice(computedFinalPrice)}
           </PoppinsText>
         </View>
       </View>
diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index db632b2..ea62541 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -19,15 +19,16 @@ const CardButton: React.FC<CardButtonProps> = ({
 }) => {
   const [count, setCount] = useState(initialValue);
   const [showCounter, setShowCounter] = useState(false);
+  const [hasInteracted, setHasInteracted] = useState(false);
 
   const toggleCounter = () => setShowCounter(count > 0);
   useEffect(toggleCounter, [count]);
 
   useEffect(() => {
-    if (getValue) {
+    if (hasInteracted && getValue) {
       getValue(count);
     }
-    if (syncQuantity) {
+    if (hasInteracted && syncQuantity) {
       syncQuantity(count);
     }
   }, [count]);
@@ -37,11 +38,13 @@ const CardButton: React.FC<CardButtonProps> = ({
   }, [initialValue]);
 
   const incrementCount = () => {
+    setHasInteracted(true);
     setCount((prev) => prev + 1);
   };
 
   const decrementCount = () => {
     if (count > 0) {
+      setHasInteracted(true);
       setCount((prev) => prev - 1);
     }
   };
diff --git a/src/components/OrderSummary.tsx b/src/components/OrderSummary.tsx
index 978f236..5b441a0 100644
--- a/src/components/OrderSummary.tsx
+++ b/src/components/OrderSummary.tsx
@@ -5,6 +5,7 @@ import PoppinsText from './PoppinsText';
 import { Colors, FontSizes } from '../styles/theme';
 import type { CartItem } from '../redux/slices/cartSlice';
 import { ChevronDownIcon, ChevronUpIcon } from 'react-native-heroicons/outline';
+import { formatPrice } from '../utils/formatPrice';
 
 const OrderSummary = () => {
   const { cartItems } = useCart();
@@ -14,26 +15,29 @@ const OrderSummary = () => {
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  // const totalDiscount = cartItems.reduce(
-  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
-  //   0,
-  // );
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
+    0,
+  );
+  const total = subtotal - totalDiscount;
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    // const discount = 10; // Comentado
-    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
-    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
+    const discount = item.discount ?? 0;
+    const discountedPrice = item.price * (1 - discount / 100);
+    const totalDiscountedPrice = discountedPrice * item.quantity;
     const totalOriginalPrice = item.price * item.quantity;
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
-          {/** 
-          <View style={styles.discountBadge}>
-            <PoppinsText style={styles.discountBadgeText}>
-              -10%
-            </PoppinsText>
-          </View>*/}
+          {discount > 0 && (
+            <View style={styles.discountBadge}>
+              <PoppinsText style={styles.discountBadgeText}>
+                -{discount}%
+              </PoppinsText>
+            </View>
+          )}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -44,15 +48,14 @@ const OrderSummary = () => {
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
             <PoppinsText style={styles.productTotalPrice}>
-              ${totalOriginalPrice.toFixed(2)}
+              ${formatPrice(totalDiscountedPrice)}
             </PoppinsText>
           </View>
-          {/**
           <PoppinsText style={styles.productOriginalPrice}>
-            ${totalOriginalPrice.toFixed(2)}
-          </PoppinsText> */}
+            ${formatPrice(totalOriginalPrice)}
+          </PoppinsText>
           <PoppinsText style={styles.productPrice}>
-            (${item.price} c/u)
+            (${formatPrice(discountedPrice)} c/u)
           </PoppinsText>
           <PoppinsText style={styles.productQuantity}>
             Cantidad: {item.quantity}
@@ -102,12 +105,20 @@ const OrderSummary = () => {
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
               <PoppinsText style={styles.subtotalText}>
-                ${subtotal.toFixed(2)}
+                ${formatPrice(subtotal)}
               </PoppinsText>
             </View>
             <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
-              <PoppinsText style={styles.discountText}>-$0.00</PoppinsText>
+              <PoppinsText style={styles.discountText}>
+                -${formatPrice(totalDiscount)}
+              </PoppinsText>
+            </View>
+            <View style={styles.row}>
+              <PoppinsText style={styles.subtotalText}>Total</PoppinsText>
+              <PoppinsText style={styles.subtotalText}>
+                ${formatPrice(total)}
+              </PoppinsText>
             </View>
           </View>
         </>
diff --git a/src/components/PaymentInfoForm.tsx b/src/components/PaymentInfoForm.tsx
index a0d9d53..e8b9b73 100644
--- a/src/components/PaymentInfoForm.tsx
+++ b/src/components/PaymentInfoForm.tsx
@@ -7,12 +7,7 @@ import Dropdown from './Dropdown';
 import { PharmaTech } from '@pharmatech/sdk';
 
 interface Props {
-  paymentMethod:
-    | 'punto_de_venta'
-    | 'efectivo'
-    | 'transferencia'
-    | 'pago_movil'
-    | null;
+  paymentMethod: 'CARD' | 'CASH' | 'BANK_TRANSFER' | 'MOBILE_PAYMENT' | null;
   total: string;
   onValidationChange: (isValid: boolean) => void;
   onBankChange: (value: string) => void;
@@ -90,11 +85,14 @@ const PaymentInfoForm: React.FC<Props> = ({
   useEffect(() => {
     const isValid =
       paymentMethod !== null &&
-      (paymentMethod === 'pago_movil' || paymentMethod === 'transferencia')
+      (paymentMethod === 'MOBILE_PAYMENT' || paymentMethod === 'BANK_TRANSFER')
         ? bank.trim() !== '' &&
-          /^\d+$/.test(reference) &&
+          /^\d{4,}$/.test(reference) &&
           reference.trim() !== '' &&
-          /^\d{1,8}$/.test(documentNumber) &&
+          !/^0+$/.test(reference) &&
+          /^\d{7,8}$/.test(documentNumber) &&
+          !/^0+$/.test(documentNumber) &&
+          !/^0/.test(documentNumber) &&
           /^\d{11}$/.test(phone)
         : true;
 
@@ -129,8 +127,8 @@ const PaymentInfoForm: React.FC<Props> = ({
 
   return (
     <View style={styles.container}>
-      {(paymentMethod === 'pago_movil' ||
-        paymentMethod === 'transferencia') && (
+      {(paymentMethod === 'MOBILE_PAYMENT' ||
+        paymentMethod === 'BANK_TRANSFER') && (
         <>
           <PoppinsText style={styles.label}>
             Realiza el pago en la siguiente cuenta de Pharmatech
@@ -155,7 +153,7 @@ const PaymentInfoForm: React.FC<Props> = ({
 
           <View style={styles.row}>
             <View style={[styles.inputWrapper, styles.largeInput]}>
-              {paymentMethod === 'pago_movil' ? (
+              {paymentMethod === 'MOBILE_PAYMENT' ? (
                 <Input
                   label="Teléfono"
                   value="0414-1234567"
@@ -208,9 +206,11 @@ const PaymentInfoForm: React.FC<Props> = ({
             placeholder="Ingrese la referencia"
             getValue={handleReferenceChange}
             fieldType="number"
-            errorText="Debe ser un número válido"
-            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
-            showIcon
+            errorText="Debe ser un número valido"
+            validation={(val) =>
+              /^\d{4,}$/.test(val) && val.trim() !== '' && !/^0+$/.test(val)
+            }
+            showIcon={reference.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
@@ -220,9 +220,14 @@ const PaymentInfoForm: React.FC<Props> = ({
             value={documentNumber}
             getValue={handleDocumentNumberChange}
             fieldType="number"
-            errorText="El campo no debe estar vacío"
-            validation={(val) => /^\d+$/.test(val) && val.trim() !== ''}
-            showIcon
+            errorText="Debe ser un número de documento valido"
+            validation={(val) =>
+              /^\d{7,8}$/.test(val) &&
+              val.trim() !== '' &&
+              !/^0+$/.test(val) &&
+              !/^0/.test(val)
+            }
+            showIcon={documentNumber.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
@@ -233,13 +238,14 @@ const PaymentInfoForm: React.FC<Props> = ({
             getValue={handlePhoneChange}
             fieldType="number"
             errorText="Debe tener exactamente 11 dígitos"
-            validation={(val) => /^\d{11}$/.test(val)}
-            showIcon
+            validation={(val) => /^\d{11}$/.test(val) && !/^0+$/.test(val)}
+            showIcon={phone.length > 0}
             useDefaultValidation={false}
             {...editableInputProps}
           />
         </>
       )}
+      {/* Si se requiere mostrar algo para CASH o CARD, agregar aquí */}
     </View>
   );
 };
diff --git a/src/components/PaymentStatusMessage.tsx b/src/components/PaymentStatusMessage.tsx
index 0446869..51748ba 100644
--- a/src/components/PaymentStatusMessage.tsx
+++ b/src/components/PaymentStatusMessage.tsx
@@ -1,44 +1,98 @@
 import React from 'react';
-import { CheckCircleIcon, XCircleIcon } from 'react-native-heroicons/outline';
+import {
+  CheckCircleIcon,
+  XCircleIcon,
+  ClockIcon,
+} from 'react-native-heroicons/outline';
 import theme from '../styles/theme';
 import { Text, View, StyleSheet } from 'react-native';
 
+type OrderStatus =
+  | 'requested'
+  | 'approved'
+  | 'ready_for_pickup'
+  | 'in_progress'
+  | 'canceled'
+  | 'completed';
+
 interface PaymentStatusMessageProps {
-  status: 'approved' | 'rejected';
+  orderStatus: OrderStatus;
   orderNumber: string;
   userName: string;
 }
 
+const statusConfig: Record<
+  OrderStatus,
+  {
+    icon: React.ElementType;
+    color: string;
+    title: string;
+    message: (orderNumber: string, userName: string) => string;
+  }
+> = {
+  requested: {
+    icon: ClockIcon,
+    color: theme.Colors.semanticWarning,
+    title: 'Orden en espera',
+    message: () =>
+      `Estamos procesando tu orden. En un momento actualizaremos el estado de tu orden. Si tienes alguna duda, por favor contacta a nuestro equipo de soporte.`,
+  },
+  approved: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Orden aprobada',
+    message: (_orderNumber, userName) =>
+      `¡Gracias por tu compra, ${userName}! Tu orden ha sido aprobada.`,
+  },
+  ready_for_pickup: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Lista para recoger',
+    message: () =>
+      'Tu pedido está listo para ser recogido en la sucursal seleccionada.',
+  },
+  in_progress: {
+    icon: ClockIcon,
+    color: theme.Colors.semanticWarning,
+    title: 'Orden en progreso',
+    message: () =>
+      'Tu pedido está en progreso. Pronto comenzaremos a procesarlo.',
+  },
+  canceled: {
+    icon: XCircleIcon,
+    color: theme.Colors.semanticDanger,
+    title: 'Orden rechazada',
+    message: () =>
+      'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.',
+  },
+  completed: {
+    icon: CheckCircleIcon,
+    color: theme.Colors.semanticSuccess,
+    title: 'Orden completada',
+    message: (_orderNumber, userName) =>
+      `¡Gracias por tu compra, ${userName}! Tu orden ha sido completada exitosamente.`,
+  },
+};
+
 const PaymentStatusMessage: React.FC<PaymentStatusMessageProps> = ({
-  status,
+  orderStatus,
   orderNumber,
   userName,
 }) => {
+  const config = statusConfig[orderStatus] || statusConfig['requested'];
+  const Icon = config.icon;
+
   return (
     <View style={styles.container}>
       <View style={styles.iconContainer}>
-        {status === 'approved' ? (
-          <CheckCircleIcon
-            width={30}
-            height={30}
-            color={theme.Colors.semanticSuccess}
-          />
-        ) : (
-          <XCircleIcon
-            width={30}
-            height={30}
-            color={theme.Colors.semanticDanger}
-          />
-        )}
+        <Icon width={30} height={30} color={config.color} />
       </View>
       <View style={styles.textContainer}>
         <Text style={[styles.title, { color: theme.Colors.textMain }]}>
-          Orden #{orderNumber}
+          {config.title} #{orderNumber}
         </Text>
         <Text style={[styles.message, { color: theme.Colors.textLowContrast }]}>
-          {status === 'approved'
-            ? `¡Gracias por tu compra, ${userName}!`
-            : 'No pudimos procesar tu orden. Lamentamos informarte que hubo un problema al generar tu pedido.'}
+          {config.message(orderNumber, userName)}
         </Text>
       </View>
     </View>
diff --git a/src/components/SearchInput.tsx b/src/components/SearchInput.tsx
index 63ffa96..20fc96c 100644
--- a/src/components/SearchInput.tsx
+++ b/src/components/SearchInput.tsx
@@ -17,6 +17,7 @@ import PoppinsText from './PoppinsText';
 import { router } from 'expo-router';
 import { ProductService } from '../services/products';
 import { ProductPresentation } from '@pharmatech/sdk';
+import { formatPrice } from '../utils/formatPrice';
 
 interface SearchInputProps {
   placeholder?: string;
@@ -195,7 +196,7 @@ const SearchInput: React.FC<SearchInputProps> = ({
                         color: Colors.primary,
                       }}
                     >
-                      $ {p?.price}
+                      $ {formatPrice(p?.price)}
                     </PoppinsText>
                   </View>
                 </TouchableOpacity>
diff --git a/src/hooks/useCart.ts b/src/hooks/useCart.ts
index 05eae89..6fd2a91 100644
--- a/src/hooks/useCart.ts
+++ b/src/hooks/useCart.ts
@@ -15,6 +15,8 @@ export const useCart = () => {
   const userId = useSelector((state: RootState) => state.cart.userId);
 
   const addToCart = (item: CartItem) => {
+    if (item.quantity <= 0) return; // <-- NO agregar si cantidad es 0
+    console.log('[addToCart] Item añadido al carrito:', item); // <-- LOG
     dispatch(addItem(item));
   };
 
@@ -22,8 +24,22 @@ export const useCart = () => {
     dispatch(removeItem(id));
   };
 
-  const updateCartQuantity = (id: string, quantity: number) => {
-    dispatch(updateQuantity({ id, quantity }));
+  const updateCartQuantity = (
+    id: string,
+    quantity: number,
+    discount?: number,
+    price?: number,
+  ) => {
+    // Busca el item actual en el carrito
+    const item = cartItems.find((item) => item.id === id);
+    dispatch(
+      updateQuantity({
+        id,
+        quantity,
+        discount: typeof discount === 'number' ? discount : item?.discount,
+        price: typeof price === 'number' ? price : item?.price,
+      }),
+    );
   };
 
   const getItemQuantity = (id: string) => {
diff --git a/src/redux/slices/cartSlice.ts b/src/redux/slices/cartSlice.ts
index 26183bc..017b1d9 100644
--- a/src/redux/slices/cartSlice.ts
+++ b/src/redux/slices/cartSlice.ts
@@ -6,6 +6,7 @@ export type CartItem = {
   price: number;
   quantity: number;
   image: string;
+  discount?: number;
 };
 
 type CartState = {
@@ -35,13 +36,16 @@ const cartSlice = createSlice({
       }
     },
     addItem: (state, action: PayloadAction<CartItem>) => {
-      const existingItem = state.items.find(
+      const existing = state.items.find(
         (item) => item.id === action.payload.id,
       );
-      if (existingItem) {
-        existingItem.quantity = action.payload.quantity;
+      if (existing) {
+        // Si ya existe, actualiza cantidad y descuento correctamente
+        existing.quantity = action.payload.quantity;
+        existing.price = action.payload.price;
+        existing.discount = action.payload.discount; // <-- ¡Asegúrate de actualizar el descuento!
       } else {
-        state.items.push(action.payload);
+        state.items.push({ ...action.payload });
       }
       state.total = calculateTotal(state.items);
     },
@@ -51,11 +55,22 @@ const cartSlice = createSlice({
     },
     updateQuantity: (
       state,
-      action: PayloadAction<{ id: string; quantity: number }>,
+      action: PayloadAction<{
+        id: string;
+        quantity: number;
+        discount?: number;
+        price?: number;
+      }>,
     ) => {
       const item = state.items.find((item) => item.id === action.payload.id);
       if (item) {
         item.quantity = action.payload.quantity;
+        if (typeof action.payload.discount === 'number') {
+          item.discount = action.payload.discount;
+        }
+        if (typeof action.payload.price === 'number') {
+          item.price = action.payload.price;
+        }
       }
       state.total = calculateTotal(state.items);
     },
diff --git a/src/screens/CartListScreen.tsx b/src/screens/CartListScreen.tsx
index b5a6f51..35762bc 100644
--- a/src/screens/CartListScreen.tsx
+++ b/src/screens/CartListScreen.tsx
@@ -14,6 +14,7 @@ import type { CartItem } from '../redux/slices/cartSlice';
 import Button from '../components/Button';
 import { TrashIcon } from 'react-native-heroicons/outline';
 import { useRouter } from 'expo-router';
+import { formatPrice } from '../utils/formatPrice';
 
 const CartListScreen = () => {
   const router = useRouter();
@@ -22,28 +23,34 @@ const CartListScreen = () => {
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
-  ); // Total price sum
-  // const totalDiscount = cartItems.reduce(
-  //   (sum, item) => sum + item.price * (item.quantity * 0.1), // Comentado
-  //   0,
-  // ); // Discount sum
-  const total = subtotal; // Subtotal without discount
+  );
+  // Total price sum
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
+    0,
+  ); // Discount sum
+  const total = subtotal - totalDiscount; // Subtotal with discount
 
   const renderItem = ({ item }: { item: CartItem }) => {
-    // const discount = 10; // Comentado
-    // const discountedPrice = item.price * (1 - discount / 100); // Comentado
-    // const totalDiscountedPrice = discountedPrice * item.quantity; // Comentado
-    const totalOriginalPrice = item.price * item.quantity; // Original total price
+    console.log('[CartListScreen] Renderizando item:', item); // <-- LOG
+    // Usar el descuento del item, si existe, si no 0
+    const discount = item.discount ?? 0;
+    const discountedPrice = item.price * (1 - discount / 100);
+    const totalDiscountedPrice = discountedPrice * item.quantity;
+    const totalOriginalPrice = item.price * item.quantity;
 
     return (
       <View style={styles.card}>
         <View style={styles.imageContainer}>
           {/* Discount badge */}
-          {/* <View style={styles.discountBadge}>
-            <PoppinsText style={styles.discountBadgeText}>
-              -{discount}%
-            </PoppinsText>
-          </View> */}
+          {discount > 0 && (
+            <View style={styles.discountBadge}>
+              <PoppinsText style={styles.discountBadgeText}>
+                -{discount}%
+              </PoppinsText>
+            </View>
+          )}
           <Image
             source={{ uri: item.image }}
             style={styles.productImage}
@@ -53,19 +60,29 @@ const CartListScreen = () => {
         <View style={styles.detailsContainer}>
           <View style={styles.row}>
             <PoppinsText style={styles.productName}>{item.name}</PoppinsText>
-            <PoppinsText style={styles.productTotalPrice}>
-              ${totalOriginalPrice.toFixed(2)}
-              {/* Original total price */}
-            </PoppinsText>
+            <View style={{ alignItems: 'flex-end' }}>
+              <PoppinsText style={styles.productTotalPrice}>
+                ${formatPrice(totalDiscountedPrice)}
+              </PoppinsText>
+              {discount > 0 && (
+                <PoppinsText style={styles.productOriginalPrice}>
+                  ${formatPrice(totalOriginalPrice)}
+                </PoppinsText>
+              )}
+            </View>
           </View>
           <PoppinsText style={styles.productPrice}>
-            (${item.price} c/u)
+            (${formatPrice(discountedPrice)} c/u)
           </PoppinsText>
           <View style={styles.quantityContainer}>
             <CardButton
-              getValue={(quantity) => updateCartQuantity(item.id, quantity)}
+              getValue={(quantity) =>
+                updateCartQuantity(item.id, quantity, item.discount ?? 0)
+              }
               initialValue={item.quantity > 0 ? item.quantity : 0}
-              syncQuantity={(quantity) => updateCartQuantity(item.id, quantity)}
+              syncQuantity={(quantity) =>
+                updateCartQuantity(item.id, quantity, item.discount ?? 0)
+              }
             />
             <TouchableOpacity
               onPress={() => removeFromCart(item.id)}
@@ -118,19 +135,19 @@ const CartListScreen = () => {
             <View style={styles.row}>
               <PoppinsText style={styles.subtotalText}>Subtotal</PoppinsText>
               <PoppinsText style={styles.subtotalText}>
-                ${subtotal.toFixed(2)}
+                ${formatPrice(subtotal)}
               </PoppinsText>
             </View>
-            {/* <View style={styles.row}>
+            <View style={styles.row}>
               <PoppinsText style={styles.discountText}>Descuentos</PoppinsText>
               <PoppinsText style={styles.discountText}>
-                -${totalDiscount.toFixed(2)}
+                -${formatPrice(totalDiscount)}
               </PoppinsText>
-            </View> */}
+            </View>
             <View style={styles.row}>
               <PoppinsText style={styles.totalText}>Total</PoppinsText>
               <PoppinsText style={styles.totalText}>
-                ${total.toFixed(2)}
+                ${formatPrice(total)}
               </PoppinsText>
             </View>
             <Button
@@ -144,6 +161,7 @@ const CartListScreen = () => {
           </View>
         </>
       )}
+      <View style={styles.height} />
     </View>
   );
 };
@@ -264,6 +282,9 @@ const styles = StyleSheet.create({
     color: Colors.textMain,
     marginBottom: 20,
   },
+  height: {
+    height: 64,
+  },
   row: {
     flexDirection: 'row',
     justifyContent: 'space-between',
diff --git a/src/screens/CheckoutScreen.tsx b/src/screens/CheckoutScreen.tsx
index fc2f671..90ad041 100644
--- a/src/screens/CheckoutScreen.tsx
+++ b/src/screens/CheckoutScreen.tsx
@@ -1,18 +1,13 @@
-import React, { useState, useEffect } from 'react';
+import React, { useState } from 'react';
 import {
   View,
   StyleSheet,
   ScrollView,
-  TouchableOpacity,
   Animated,
   BackHandler,
+  RefreshControl,
 } from 'react-native';
-import {
-  ShoppingBagIcon,
-  TruckIcon,
-  MapPinIcon,
-  ChevronLeftIcon,
-} from 'react-native-heroicons/outline';
+import { ShoppingBagIcon, TruckIcon } from 'react-native-heroicons/outline';
 import { Colors, FontSizes } from '../styles/theme';
 import RadioCard from '../components/RadioCard';
 import OrderSummary from '../components/OrderSummary';
@@ -22,80 +17,55 @@ import Steps from '../components/Steps';
 import PaymentMethods from '../components/PaymentMethods';
 import PoppinsText from '../components/PoppinsText';
 import LocationSelector from '../components/LocationSelector';
-import PaymentInfoForm from '../components/PaymentInfoForm';
 import Coupon from '../components/Coupon';
-import PaymentStatusMessage from '../components/PaymentStatusMessage';
 import { useRouter } from 'expo-router';
 import { OrderService } from '../services/order';
-import { UserService } from '../services/user';
-import { OrderType, CreateOrder, CreateOrderDetail } from '../types/api.d';
 import BranchMapModal from '../components/BranchMapModal';
 import { useDispatch, useSelector } from 'react-redux';
 import { clearCart } from '../redux/slices/cartSlice';
 import { useFocusEffect } from '@react-navigation/native';
-import Popup from '../components/Popup'; // Import the Popup component
+import Popup from '../components/Popup';
 import EmailVerificationModal from './tab/EmailVerificationModal';
 import { RootState, AppDispatch } from '../redux/store';
 import {
-  setStep,
   setOption,
   setPayment,
   setLocationId,
-  setPaymentInfoValid,
-  resetCheckout,
   setCouponDiscount,
   setCouponApplied,
 } from '../redux/slices/checkoutSlice';
 
+import {
+  OrderType,
+  CreateOrder,
+  CreateOrderDetail,
+  PaymentMethod,
+} from '@pharmatech/sdk';
+import { formatPrice } from '../utils/formatPrice';
+
 const CheckoutScreen = () => {
   const dispatch = useDispatch<AppDispatch>();
-  const {
-    step,
-    option,
-    payment,
-    locationId,
-    paymentInfoValid,
-    couponDiscount,
-    couponApplied,
-  } = useSelector((state: RootState) => state.checkout);
+  const { step, option, payment, locationId, couponDiscount, couponApplied } =
+    useSelector((state: RootState) => state.checkout);
 
   const router = useRouter();
   const { cartItems } = useCart();
-  const [status, setStatus] = useState<'approved' | 'rejected'>('approved');
   const [errorMessage, setErrorMessage] = useState<string | null>(null);
-  const [userName, setUserName] = useState<string | null>('Usuario');
+  //const [userName, setUserName] = useState<string | null>('Usuario');
   const [modalVisible, setModalVisible] = useState(false);
   const [selectedBranch, setSelectedBranch] = useState<{
     name: string;
     latitude: number;
     longitude: number;
   } | null>(null);
-  const [orderNumber, setOrderNumber] = useState<string | null>(null);
+  // const [orderNumber, setOrderNumber] = useState<string | null>(null); // commented: unused
   const [popupVisible, setPopupVisible] = useState(false);
   const [popupMessages, setPopupMessages] = useState<string[]>([]);
   const [validationPopupVisible, setValidationPopupVisible] = useState(false);
   const [emailVerificationModalVisible, setEmailVerificationModalVisible] =
     useState(false); // Track modal visibility
-
-  useEffect(() => {
-    const fetchUserName = async () => {
-      const response = await UserService.getProfile();
-      if (response.success && response.data) {
-        const { firstName, isValidated } = response.data;
-        setUserName(firstName);
-        if (!isValidated) {
-          setValidationPopupVisible(true);
-        }
-      } else if (!response.success) {
-        console.error(
-          'Error al obtener el nombre del usuario:',
-          response.error,
-        );
-      }
-    };
-
-    fetchUserName();
-  }, []);
+  // const [orderStatus, setOrderStatus] = useState<string | null>(null); // commented: unused
+  // Suscribe al socket usando el hook; solo se conecta cuando orderNumber no es null
 
   useFocusEffect(
     React.useCallback(() => {
@@ -114,28 +84,29 @@ const CheckoutScreen = () => {
     }, [step]),
   );
 
-  const isSimplifiedSteps =
-    (option === 'pickup' && payment === 'punto_de_venta') ||
-    (option === 'delivery' && payment === 'efectivo');
-
-  const stepsLabels = isSimplifiedSteps
-    ? ['Opciones de Compra', 'Confirmación de orden']
-    : ['Opciones de Compra', 'Visualización de datos', 'Confirmación de orden'];
+  // Solo mostrar el paso 1
+  const stepsLabels = ['Opciones de Compra'];
 
   const subtotal = cartItems.reduce(
     (sum, item) => sum + item.price * item.quantity,
     0,
   );
-  {
-    /** const totalDiscount = cartItems.reduce(
-    (sum, item) => sum + item.price * (item.quantity * 0.1),
+
+  // Calcula el descuento total de los productos (igual que OrderSummary)
+  const totalDiscount = cartItems.reduce(
+    (sum, item) =>
+      sum + item.price * item.quantity * ((item.discount ?? 0) / 100),
     0,
-  );*/
-  }
-  const subtotalAfterDiscount = subtotal; // - totalDiscount;
+  );
+
+  // Subtotal después de descuentos de productos
+  const subtotalAfterDiscount = subtotal - totalDiscount;
+
+  // Aplica el cupón sobre el subtotal ya descontado
   const subtotalAfterCoupon = couponApplied
     ? subtotalAfterDiscount * (1 - couponDiscount / 100)
     : subtotalAfterDiscount;
+
   const total = subtotalAfterCoupon;
 
   const renderFooterMessage = () => {
@@ -148,25 +119,21 @@ const CheckoutScreen = () => {
     return null;
   };
 
-  const isValidUUID = (value: string | null): boolean => {
-    const uuidRegex =
-      /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
-    return value !== null && uuidRegex.test(value);
-  };
+  // const isValidUUID = (value: string | null): boolean => {
+  //   const uuidRegex =
+  //     /^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i;
+  //   return value !== null && uuidRegex.test(value);
+  // };
 
   const handleContinue = async () => {
     const missingFields: string[] = [];
 
-    if (step < stepsLabels.length - 1) {
-      // Validation for steps before the confirmation step
-      if (step === 1) {
-        if (!option) missingFields.push('Seleccionar una opción de compra.');
-        if (!locationId)
-          missingFields.push('Seleccionar una opción de locación.');
-        if (!payment) missingFields.push('Seleccionar un método de pago.');
-      } else if (step === 2 && !isSimplifiedSteps && !paymentInfoValid) {
-        missingFields.push('Completar la información de pago.');
-      }
+    // Validación solo para el paso 1
+    if (step === 1) {
+      if (!option) missingFields.push('Seleccionar una opción de compra.');
+      if (!locationId)
+        missingFields.push('Seleccionar una opción de locación.');
+      if (!payment) missingFields.push('Seleccionar un método de pago.');
 
       if (missingFields.length > 0) {
         setPopupMessages(missingFields);
@@ -174,197 +141,109 @@ const CheckoutScreen = () => {
         return;
       }
 
-      dispatch(setStep(step + 1));
-    } else if (step === stepsLabels.length - 1) {
-      // Ensure payment form is valid before creating the order
-      if (!isSimplifiedSteps && !paymentInfoValid) {
-        setPopupMessages(['Completar la información de pago correctamente.']);
-        setPopupVisible(true);
-        return;
+      // Validar los productos del carrito
+      const products: CreateOrderDetail[] = cartItems
+        .filter((item) => item.quantity > 0)
+        .map((item) => ({
+          productPresentationId: item.id,
+          quantity: item.quantity,
+        }));
+
+      setErrorMessage(null);
+
+      let sdkPaymentMethod: PaymentMethod;
+      switch (payment) {
+        case 'efectivo':
+          sdkPaymentMethod = PaymentMethod.CASH;
+          break;
+        case 'punto_de_venta':
+          sdkPaymentMethod = PaymentMethod.CARD;
+          break;
+        case 'transferencia':
+          sdkPaymentMethod = PaymentMethod.BANK_TRANSFER;
+          break;
+        case 'pago_movil':
+          sdkPaymentMethod = PaymentMethod.MOBILE_PAYMENT;
+          break;
+        default:
+          sdkPaymentMethod = PaymentMethod.CASH;
       }
 
-      // Create the order on the penultimate step
-      try {
-        if (option === 'pickup' && !isValidUUID(locationId)) {
-          setErrorMessage('La sucursal seleccionada no es válida.');
-          setStatus('rejected');
-          return;
-        }
-
-        if (option === 'delivery' && !isValidUUID(locationId)) {
-          setErrorMessage('La dirección seleccionada no es válida.');
-          setStatus('rejected');
-          return;
-        }
-
-        if (!option) {
-          setErrorMessage('Debe seleccionar una opción de compra.');
-          setStatus('rejected');
-          return;
-        }
-
-        setErrorMessage(null);
-
-        // Validar los productos del carrito
-        const products: CreateOrderDetail[] = cartItems
-          .filter((item) => item.quantity > 0)
-          .map((item) => ({
-            productPresentationId: item.id,
-            quantity: item.quantity, // Solo incluir los campos esperados
-          }));
-
-        if (products.length === 0) {
-          setErrorMessage('No hay productos válidos en el carrito.');
-          setStatus('rejected');
-          return;
-        }
-
-        // Log del carrito y los productos seleccionados
-        console.log('Productos en el carrito:', cartItems);
-        console.log('Productos seleccionados para la orden:', products);
-
-        // Construir el payload de la orden
-        const orderPayload: CreateOrder = {
-          type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
-          branchId: option === 'pickup' ? locationId || undefined : undefined,
-          userAddressId:
-            option === 'delivery' ? locationId || undefined : undefined,
-          products,
-        };
-
-        // Log del payload que se enviará al backend
-        console.log('Payload enviado al backend:', orderPayload);
+      // Construir el payload de la orden usando el método seleccionado
+      const orderPayload: CreateOrder = {
+        type: option === 'pickup' ? OrderType.PICKUP : OrderType.DELIVERY,
+        branchId: option === 'pickup' ? locationId || undefined : undefined,
+        userAddressId:
+          option === 'delivery' ? locationId || undefined : undefined,
+        products,
+        paymentMethod: sdkPaymentMethod,
+        ...(couponApplied && {
+          couponCode:
+            typeof couponDiscount === 'number' && couponDiscount > 0
+              ? 'COUPON'
+              : undefined,
+        }),
+      };
 
+      try {
         // Enviar la orden al backend
         const orderResponse = await OrderService.create(orderPayload);
 
-        // Log de la respuesta del backend
-        console.log('Respuesta del backend:', orderResponse);
-
-        // Validar la respuesta
         if (!orderResponse?.id) {
           setErrorMessage(
             'No pudimos procesar tu orden. Inténtalo nuevamente.',
           );
-          setStatus('rejected');
-          return;
         }
 
-        // Guardar el número de orden generado
-        setOrderNumber(orderResponse.id);
-
-        console.log('Orden creada exitosamente:', orderResponse);
-
-        setStatus('approved');
-        dispatch(setStep(step + 1)); // Move to the confirmation step
+        // Redirigir a la pantalla de orden en progreso (step 2 y 3)
+        router.push({
+          pathname: '/in-progress-order',
+          params: {
+            orderNumber: orderResponse.id,
+          },
+        });
       } catch (error) {
         console.error('Error al procesar la orden:', error);
         setErrorMessage('Ocurrió un error inesperado. Inténtalo nuevamente.');
-        setStatus('rejected');
       }
-    } else if (step === stepsLabels.length) {
-      // Limpiar el carrito al salir del flujo de checkout
-      dispatch(clearCart());
-      dispatch(resetCheckout());
-      router.dismissAll();
-      router.replace({
-        pathname: '/(tabs)',
-      });
-    }
-  };
-
-  const handleGoBack = () => {
-    if (step === stepsLabels.length) {
-      // Si estamos en el último paso, no permitir retroceder
       return;
     }
-
-    if (step === 1) {
-      router.back();
-    } else if (step > 1) {
-      dispatch(setStep(step - 1));
-    }
-  };
-
-  const handleOpenMapModal = () => {
-    if (selectedBranch) {
-      setModalVisible(true); // Open the modal only if a branch is selected
-    } else {
-      console.error('No branch selected to display on the map.');
-    }
   };
 
-  const renderConfirmationContent = (status: 'approved' | 'rejected') => {
-    if (option === 'pickup' && status === 'approved') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Tu pedido ya está listo para que pases por él en la sucursal
-            indicada. En el mapa adjunto podrás ver la ubicación exacta para que
-            llegues sin problemas.
-          </PoppinsText>
-          <PoppinsText style={styles.sucursalText}>
-            Sucursal de retiro:{' '}
-            {selectedBranch?.name || '[Nombre de la sucursal]'}
-          </PoppinsText>
-          <Button
-            title="Ver Ubicación en el Mapa"
-            size="small"
-            style={styles.secondaryButton}
-            variant="secondary"
-            icon={<MapPinIcon width={16} height={16} color={Colors.textMain} />}
-            onPress={handleOpenMapModal} // Open the modal
-          />
-        </>
-      );
-    }
-
-    if (option === 'delivery' && status === 'approved') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Estamos preparando tu pedido para enviarlo a la dirección indicada.
-          </PoppinsText>
-          <PoppinsText style={styles.confirmationMessage}>
-            Recibirás notificaciones cuando tu pedido esté en camino. En breve,
-            un motorizado tomará tu orden.
-          </PoppinsText>
-          <Button
-            title="Información del repartidor"
-            size="small"
-            style={styles.secondaryButton}
-            variant="secondary"
-            onPress={() => console.log('Información del repartidor')}
-          />
-        </>
-      );
-    }
-
-    if (status === 'rejected') {
-      return (
-        <>
-          <PoppinsText style={styles.confirmationMessage}>
-            Lamentamos informarte que hubo un problema al generar tu pedido.
-          </PoppinsText>
-          <Button
-            title="Volver a Intentar"
-            size="medium"
-            style={styles.primaryButton}
-            variant="primary"
-            onPress={() => console.log('Volver a Intentar')}
-          />
-        </>
-      );
-    }
-
-    return null;
-  };
+  //const handleOpenMapModal = () => {
+  //if (selectedBranch) {
+  //  setModalVisible(true); // Open the modal only if a branch is selected
+  // } else {
+  //  console.error('No branch selected to display on the map.');
+  //}
+  // };
+
+  // const renderConfirmationContent = (status: OrderStatus | null) => {
+  //   if (status === 'approved' && option === 'pickup') {
+  //     return <PoppinsText>Tu pedido está listo para recoger.</PoppinsText>;
+  //   }
+  //   if (status === 'approved' && option === 'delivery') {
+  //     return <PoppinsText>Tu pedido está en camino.</PoppinsText>;
+  //   }
+  //   return null;
+  // };
 
   const handleApplyCoupon = (discountAmount: number) => {
     dispatch(setCouponDiscount(discountAmount));
     dispatch(setCouponApplied(true));
   };
 
+  const [refreshing, setRefreshing] = useState(false); // <-- Agregado
+
+  const onRefresh = React.useCallback(() => {
+    setRefreshing(true);
+    // Aquí puedes recargar datos del carrito, usuario, etc.
+    // Simulación de recarga:
+    setTimeout(() => {
+      setRefreshing(false);
+    }, 1000);
+  }, []);
+
   return (
     <>
       <Popup
@@ -390,14 +269,14 @@ const CheckoutScreen = () => {
         visible={emailVerificationModalVisible}
         onClose={() => setEmailVerificationModalVisible(false)} // Close the modal
       />
-      <ScrollView contentContainerStyle={styles.scrollContainer}>
+      <ScrollView
+        contentContainerStyle={styles.scrollContainer}
+        refreshControl={
+          <RefreshControl refreshing={refreshing} onRefresh={onRefresh} />
+        }
+      >
         <View style={styles.container}>
-          {step < stepsLabels.length && (
-            <TouchableOpacity style={styles.backButton} onPress={handleGoBack}>
-              <ChevronLeftIcon width={24} height={24} color={Colors.textMain} />
-            </TouchableOpacity>
-          )}
-
+          {/* Solo mostrar el step 1 */}
           <View style={styles.steps}>
             <Animated.View style={{ opacity: 1 }}>
               <Steps
@@ -407,114 +286,61 @@ const CheckoutScreen = () => {
               />
             </Animated.View>
           </View>
-
           {errorMessage && (
             <PoppinsText style={styles.errorMessage}>
               {errorMessage}
             </PoppinsText>
           )}
-
-          {step === 1 && (
-            <>
-              <PoppinsText style={styles.purchaseOptionsTitle}>
-                Opciones de Compra
-              </PoppinsText>
-              <View style={styles.radioContainer}>
-                <View style={styles.radioItem}>
-                  <RadioCard
-                    label="Retiro en Sucursal"
-                    icon={<ShoppingBagIcon color={Colors.textMain} />}
-                    selected={option === 'pickup'}
-                    onPress={() => {
-                      dispatch(setOption('pickup'));
-                      dispatch(setLocationId(null));
-                    }}
-                  />
-                </View>
-                <View>
-                  <RadioCard
-                    label="Delivery"
-                    icon={<TruckIcon color={Colors.textMain} />}
-                    selected={option === 'delivery'}
-                    onPress={() => {
-                      dispatch(setOption('delivery'));
-                      dispatch(setLocationId(null));
-                    }}
-                  />
-                </View>
-              </View>
-              <LocationSelector
-                selectedOption={option || 'pickup'}
-                onSelect={(val) => dispatch(setLocationId(val))}
-                setSelectedBranch={setSelectedBranch}
+          {/* Solo el paso 1 */}
+          <PoppinsText style={styles.purchaseOptionsTitle}>
+            Opciones de Compra
+          </PoppinsText>
+          <View style={styles.radioContainer}>
+            <View style={styles.radioItem}>
+              <RadioCard
+                label="Retiro en Sucursal"
+                icon={<ShoppingBagIcon color={Colors.textMain} />}
+                selected={option === 'pickup'}
+                onPress={() => {
+                  dispatch(setOption('pickup'));
+                  dispatch(setLocationId(null));
+                }}
               />
-              <View style={styles.paymentMethods}>
-                <PaymentMethods
-                  selectedOption={option}
-                  selectedPayment={payment}
-                  setSelectedPayment={(val) => dispatch(setPayment(val))}
-                />
-              </View>
-              {renderFooterMessage() && (
-                <PoppinsText style={styles.footerMessage}>
-                  {renderFooterMessage()}
-                </PoppinsText>
-              )}
-            </>
-          )}
-
-          {step === 2 && !isSimplifiedSteps && (
-            <>
-              <PoppinsText
-                style={[styles.purchaseOptionsTitle, styles.step2Title]}
-              >
-                Visualización de datos
-              </PoppinsText>
-              <View style={styles.paymentInfoFormContainer}>
-                <PaymentInfoForm
-                  paymentMethod={payment}
-                  total={total.toFixed(2)}
-                  onValidationChange={(isValid) =>
-                    dispatch(setPaymentInfoValid(isValid))
-                  }
-                  onBankChange={(value) => console.log('Bank changed:', value)}
-                  onReferenceChange={(value) =>
-                    console.log('Reference changed:', value)
-                  }
-                  onDocumentNumberChange={(value) =>
-                    console.log('Document number changed:', value)
-                  }
-                  onPhoneChange={(value) =>
-                    console.log('Phone changed:', value)
-                  }
-                />
-              </View>
-            </>
-          )}
-
-          {step === stepsLabels.length && (
-            <>
-              <PoppinsText style={styles.purchaseOptionsTitle}>
-                Confirmación de Orden
-              </PoppinsText>
-              <PaymentStatusMessage
-                status={status}
-                orderNumber={orderNumber ? orderNumber.split('-')[0] : 'N/A'}
-                userName={userName || 'Usuario'}
+            </View>
+            <View>
+              <RadioCard
+                label="Delivery"
+                icon={<TruckIcon color={Colors.textMain} />}
+                selected={option === 'delivery'}
+                onPress={() => {
+                  dispatch(setOption('delivery'));
+                  dispatch(setLocationId(null));
+                }}
               />
-              <View style={styles.confirmationContainer}>
-                {renderConfirmationContent(status)}
-              </View>
-            </>
+            </View>
+          </View>
+          <LocationSelector
+            selectedOption={option || 'pickup'}
+            onSelect={(val) => dispatch(setLocationId(val))}
+            setSelectedBranch={setSelectedBranch}
+          />
+          <View style={styles.paymentMethods}>
+            <PaymentMethods
+              selectedOption={option}
+              selectedPayment={payment}
+              setSelectedPayment={(val) => dispatch(setPayment(val))}
+            />
+          </View>
+          {renderFooterMessage() && (
+            <PoppinsText style={styles.footerMessage}>
+              {renderFooterMessage()}
+            </PoppinsText>
           )}
-
           <View style={styles.whiteBackgroundContainer}>
-            {step !== 2 && step < stepsLabels.length && (
-              <Coupon
-                onApplyCoupon={handleApplyCoupon}
-                onCouponApplied={() => dispatch(setCouponApplied(true))}
-              />
-            )}
+            <Coupon
+              onApplyCoupon={handleApplyCoupon}
+              onCouponApplied={() => dispatch(setCouponApplied(true))}
+            />
             <OrderSummary />
             <View style={styles.totalContainer}>
               {couponApplied && (
@@ -529,25 +355,16 @@ const CheckoutScreen = () => {
                   </View>
                 </>
               )}
-              <View style={styles.totalRow}>
-                {/* <PoppinsText style={styles.descuentoLabel}>IVA:</PoppinsText>
-<PoppinsText style={styles.descuentoAmount}>+${iva.toFixed(2)}</PoppinsText> */}
-              </View>
+              <View style={styles.totalRow}></View>
               <View style={styles.totalRow}>
                 <PoppinsText style={styles.totalLabel}>Total:</PoppinsText>
                 <PoppinsText style={styles.totalAmount}>
-                  ${total.toFixed(2)}
+                  ${formatPrice(total)}
                 </PoppinsText>
               </View>
             </View>
             <Button
-              title={
-                step === 2 && !isSimplifiedSteps
-                  ? 'Confirmar Pago'
-                  : step < stepsLabels.length
-                    ? 'Continuar'
-                    : 'Volver al Home'
-              }
+              title="Realizar Pago"
               size="medium"
               style={styles.checkoutButton}
               variant={'primary'}
diff --git a/src/screens/InProgressOrderScreen.tsx b/src/screens/InProgressOrderScreen.tsx
new file mode 100644
index 0000000..cebbf75
--- /dev/null
+++ b/src/screens/InProgressOrderScreen.tsx
@@ -0,0 +1,463 @@
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  StyleSheet,
+  ScrollView,
+  RefreshControl,
+  ActivityIndicator,
+} from 'react-native';
+import PaymentStatusMessage from '../components/PaymentStatusMessage';
+import PaymentInfoForm from '../components/PaymentInfoForm';
+import OrderSummary from '../components/OrderSummary';
+import { Colors, FontSizes } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
+import { useLocalSearchParams } from 'expo-router';
+import { UserService } from '../services/user';
+import Steps from '../components/Steps';
+import Button from '../components/Button';
+import { truncateString } from '../utils/commons';
+import {
+  OrderStatus,
+  OrderDetailedResponse,
+  PharmaTech,
+  PaymentConfirmation,
+} from '@pharmatech/sdk';
+import * as SecureStore from 'expo-secure-store';
+import Popup from '../components/Popup';
+import {
+  initializeSocket,
+  disconnectSocket,
+} from '../lib/deliverySocket/deliverySocket';
+import { Socket } from 'socket.io-client';
+import Alert from '../components/Alerts';
+import { useRouter } from 'expo-router';
+import { useDispatch } from 'react-redux';
+import { clearCart } from '../redux/slices/cartSlice';
+import { resetCheckout } from '../redux/slices/checkoutSlice';
+
+const stepsLabels = [
+  'Opciones de Compra',
+  'Visualización de datos',
+  'Confirmación de orden',
+];
+
+const InProgressOrderScreen = () => {
+  const { orderNumber } = useLocalSearchParams();
+
+  // Siempre inicia en step 3
+  const [step, setStep] = useState(3);
+  const [userName, setUserName] = useState<string | null>('Usuario');
+  const [order, setOrder] = useState<OrderDetailedResponse | null>(null);
+  const [showValidationPopup, setShowValidationPopup] = useState(false);
+  const [paymentFormValid, setPaymentFormValid] = useState(false);
+  const [bank, setBank] = useState('');
+  const [reference, setReference] = useState('');
+  const [documentNumber, setDocumentNumber] = useState('');
+  const [phoneNumber, setPhoneNumber] = useState('');
+  const [backendResponse, setBackendResponse] = useState<string | null>(null);
+  const [refreshing, setRefreshing] = useState<boolean>(false);
+  const [isSubmittingPayment, setIsSubmittingPayment] = useState(false);
+  const router = useRouter();
+  const dispatch = useDispatch();
+
+  // Extrae la lógica de obtención de la orden
+  const fetchOrder = async () => {
+    if (!orderNumber) return;
+    try {
+      const sdk = PharmaTech.getInstance();
+      const jwt = await SecureStore.getItemAsync('auth_token');
+      if (!jwt) {
+        console.error('No JWT found in SecureStore');
+        return;
+      }
+      const orderData = await sdk.order.getById(orderNumber as string, jwt);
+      setOrder(orderData);
+
+      // Solo cambia a step 2 si status es 'approved' y paymentMethod es BANK_TRANSFER o MOBILE_PAYMENT
+      if (
+        orderData &&
+        orderData.status &&
+        orderData.status.toLowerCase() === 'approved' &&
+        orderData.paymentMethod &&
+        ['BANK_TRANSFER', 'MOBILE_PAYMENT'].includes(
+          orderData.paymentMethod.toUpperCase(),
+        )
+      ) {
+        setStep(2);
+        return;
+      }
+      setStep(3);
+    } catch (error) {
+      console.error('Error fetching order:', error);
+    } finally {
+      setRefreshing(false);
+    }
+  };
+
+  useEffect(() => {
+    const fetchUserName = async () => {
+      const response = await UserService.getProfile();
+      if (response.success && response.data) {
+        setUserName(response.data.firstName);
+      }
+    };
+    fetchUserName();
+  }, []);
+
+  useEffect(() => {
+    fetchOrder();
+  }, [orderNumber]);
+
+  // 1) socket-only: actualiza order.status
+  useEffect(() => {
+    let socket: Socket;
+    const setupSocket = async () => {
+      socket = await initializeSocket();
+      socket.connect();
+      socket.on('orderUpdated', (data: { orderId: string; status: string }) => {
+        console.log('[Socket] orderUpdated received →', data);
+        if (orderNumber && data.orderId === orderNumber) {
+          setOrder((prev) =>
+            prev ? { ...prev, status: data.status as OrderStatus } : prev,
+          );
+          setIsSubmittingPayment(false); // <-- Oculta el loader cuando llega el update
+        }
+      });
+    };
+    setupSocket();
+    return () => {
+      socket?.off('orderUpdated');
+      disconnectSocket();
+    };
+  }, []); // solo al montar
+
+  // 2) efecto separado: cada vez que 'order' cambia, recalcula el step
+  useEffect(() => {
+    if (!order) return;
+    const normalized = order.status.toLowerCase();
+    const pm = order.paymentMethod?.toLowerCase();
+    if (
+      normalized === 'approved' &&
+      (pm === 'bank_transfer' || pm === 'mobile_payment')
+    ) {
+      setStep(2);
+    } else {
+      setStep(3);
+    }
+  }, [order]);
+
+  const handleContinue = () => {
+    // Limpiar el carrito al salir del flujo de checkout
+    dispatch(clearCart());
+    dispatch(resetCheckout());
+    router.dismissAll();
+    router.replace({
+      pathname: '/(tabs)',
+    });
+  };
+
+  // Handler para pull-to-refresh
+  const onRefresh = async () => {
+    setRefreshing(true);
+    await fetchOrder();
+  };
+
+  return (
+    <>
+      {/* Alerta para mostrar la respuesta del backend */}
+      {backendResponse && (
+        <Alert
+          title="Respuesta"
+          message={backendResponse}
+          type={
+            backendResponse.includes('error') ||
+            backendResponse.includes('Error')
+              ? 'error'
+              : 'success'
+          }
+          alertStyle="regular"
+          borderColor={true}
+          onClose={() => setBackendResponse(null)}
+        />
+      )}
+      <ScrollView
+        contentContainerStyle={styles.scrollContainer}
+        refreshControl={
+          <RefreshControl
+            refreshing={refreshing}
+            onRefresh={onRefresh}
+            colors={[Colors.primary]}
+          />
+        }
+      >
+        <View style={styles.container}>
+          <View style={styles.steps}>
+            <Steps
+              totalSteps={stepsLabels.length}
+              currentStep={step}
+              labels={stepsLabels}
+            />
+          </View>
+          {step === 1 && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Opciones de Compra
+              </PoppinsText>
+            </>
+          )}
+          {/* Ocultar step 2 si el método de pago es CARD o CASH */}
+          {step === 2 &&
+            order &&
+            order.paymentMethod &&
+            !['CARD', 'CASH'].includes(order.paymentMethod.toUpperCase()) && (
+              <>
+                <PoppinsText style={styles.purchaseOptionsTitle}>
+                  Visualización de datos
+                </PoppinsText>
+                <View style={styles.paymentInfoFormContainer}>
+                  {isSubmittingPayment ? (
+                    <View style={styles.loaderContainer}>
+                      <ActivityIndicator size="large" color={Colors.primary} />
+                      <PoppinsText style={{ marginTop: 16 }}>
+                        Procesando pago...
+                      </PoppinsText>
+                    </View>
+                  ) : (
+                    <PaymentInfoForm
+                      paymentMethod={
+                        order.paymentMethod
+                          ? (order.paymentMethod.toUpperCase() as
+                              | 'CARD'
+                              | 'CASH'
+                              | 'BANK_TRANSFER'
+                              | 'MOBILE_PAYMENT'
+                              | null)
+                          : null
+                      }
+                      total={order.totalPrice ? String(order.totalPrice) : ''}
+                      onValidationChange={setPaymentFormValid}
+                      onBankChange={setBank}
+                      onReferenceChange={setReference}
+                      onDocumentNumberChange={setDocumentNumber}
+                      onPhoneChange={setPhoneNumber}
+                    />
+                  )}
+                </View>
+                <View style={styles.whiteBackgroundContainer}>
+                  <OrderSummary />
+                  <View style={styles.totalContainer}>
+                    <View style={styles.totalRow}>
+                      <PoppinsText style={styles.totalLabel}>
+                        Total:
+                      </PoppinsText>
+                      <PoppinsText style={styles.totalAmount}>
+                        ${order.totalPrice ? order.totalPrice : ''}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                  <View style={styles.buttonContainer}>
+                    <Button
+                      title="Confirmar Orden"
+                      size="medium"
+                      style={styles.nextButton}
+                      variant="primary"
+                      onPress={async () => {
+                        if (!paymentFormValid) {
+                          setShowValidationPopup(true);
+                          return;
+                        }
+                        setIsSubmittingPayment(true); // <-- Muestra loader
+                        try {
+                          const sdk = PharmaTech.getInstance();
+                          const jwt =
+                            await SecureStore.getItemAsync('auth_token');
+                          if (!jwt) {
+                            setBackendResponse('No JWT found en SecureStore');
+                            setIsSubmittingPayment(false);
+                            return;
+                          }
+                          const paymentConfirmation: PaymentConfirmation = {
+                            bank,
+                            reference,
+                            documentId: documentNumber,
+                            phoneNumber,
+                            orderId: order.id,
+                          };
+                          const response = await sdk.paymentConfirmation.create(
+                            paymentConfirmation,
+                            jwt,
+                          );
+                          setBackendResponse(
+                            response && response.id
+                              ? '¡Pago enviado correctamente!'
+                              : 'Respuesta recibida del servidor.',
+                          );
+                          // NO cambies el step aquí, espera al socket
+                        } catch (error: unknown) {
+                          let errorMessage =
+                            'Error enviando confirmación de pago. Intenta nuevamente.';
+                          function hasMessage(
+                            e: unknown,
+                          ): e is { message: string } {
+                            return (
+                              typeof e === 'object' &&
+                              e !== null &&
+                              'message' in e &&
+                              typeof (e as { message?: unknown }).message ===
+                                'string'
+                            );
+                          }
+                          if (hasMessage(error)) {
+                            errorMessage = error.message;
+                          }
+                          setBackendResponse(errorMessage);
+                          setIsSubmittingPayment(false); // Oculta loader si hay error
+                        }
+                      }}
+                    />
+                  </View>
+                </View>
+              </>
+            )}
+          {step === 3 && order && (
+            <>
+              <PoppinsText style={styles.purchaseOptionsTitle}>
+                Confirmacion de la orden
+              </PoppinsText>
+              <PaymentStatusMessage
+                orderStatus={order.status as OrderStatus}
+                orderNumber={truncateString(order.id as string, 8, '')}
+                userName={userName || ''}
+              />
+              {/* Botón Volver al Home en un View con padding 20 */}
+              <View style={{ padding: 20 }}>
+                <Button
+                  title="Volver al Home"
+                  size="medium"
+                  style={[styles.checkoutButton]}
+                  variant="secondaryLight"
+                  textStyle={{ color: Colors.textMain }}
+                  onPress={handleContinue}
+                />
+              </View>
+              <View style={{ flex: 1, justifyContent: 'flex-end' }}>
+                <View style={styles.whiteBackgroundContainer}>
+                  <OrderSummary />
+                  <View style={styles.totalContainer}>
+                    <View style={styles.totalRow}>
+                      <PoppinsText style={styles.totalLabel}>
+                        Total:
+                      </PoppinsText>
+                      <PoppinsText style={styles.totalAmount}>
+                        ${order.totalPrice ? order.totalPrice : ''}
+                      </PoppinsText>
+                    </View>
+                  </View>
+                </View>
+              </View>
+            </>
+          )}
+        </View>
+      </ScrollView>
+      <Popup
+        visible={showValidationPopup}
+        headerText="Campos requeridos"
+        bodyText="Por favor completa y valida todos los campos requeridos antes de continuar."
+        primaryButton={{
+          text: 'Aceptar',
+          onPress: () => setShowValidationPopup(false),
+        }}
+        onClose={() => setShowValidationPopup(false)}
+      />
+    </>
+  );
+};
+
+const styles = StyleSheet.create({
+  scrollContainer: {
+    flexGrow: 1,
+    justifyContent: 'flex-start', // Fuerza el contenido arriba SIEMPRE
+  },
+  container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+  },
+  steps: {
+    marginTop: 30,
+    padding: 20,
+    // No uses flex ni justifyContent aquí
+  },
+  stepLabel: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    alignSelf: 'flex-start',
+    paddingVertical: 8,
+  },
+  purchaseOptionsTitle: {
+    fontSize: FontSizes.h5.size,
+    color: Colors.textMain,
+    alignSelf: 'flex-start',
+    padding: 20,
+  },
+  confirmationContainer: {
+    marginTop: 20,
+    alignItems: 'center',
+    paddingHorizontal: 20,
+  },
+  buttonContainer: {
+    marginTop: 20,
+    alignItems: 'flex-end',
+  },
+  nextButton: {
+    color: Colors.primary,
+    fontSize: FontSizes.h5.size,
+    fontWeight: 'bold',
+    padding: 10,
+    width: '100%',
+    height: 50,
+    marginTop: 15,
+    marginBottom: 16,
+  },
+  whiteBackgroundContainer: {
+    backgroundColor: '#FFFFFF',
+    padding: 20,
+    borderTopLeftRadius: 16,
+    borderTopRightRadius: 16,
+    marginTop: 20,
+  },
+  paymentInfoFormContainer: {
+    paddingHorizontal: 20,
+    paddingTop: 0,
+  },
+  totalContainer: {
+    width: '100%',
+    marginBottom: 10,
+  },
+  totalRow: {
+    flexDirection: 'row',
+    justifyContent: 'space-between',
+    alignItems: 'center',
+    width: '100%',
+  },
+  totalLabel: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.textMain,
+  },
+  totalAmount: {
+    fontSize: FontSizes.h5.size,
+    lineHeight: FontSizes.h5.lineHeight,
+    color: Colors.primary,
+  },
+  checkoutButton: {
+    marginTop: 24,
+    width: '100%',
+  },
+  loaderContainer: {
+    alignItems: 'center',
+    justifyContent: 'center',
+    paddingVertical: 40,
+  },
+});
+
+export default InProgressOrderScreen;
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 73a5600..5433cbf 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -16,6 +16,7 @@ import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
 import OrderBadge from '../components/OrderBadge';
 import { useCart } from '../hooks/useCart';
+import { formatPrice } from '../utils/formatPrice';
 
 const OrdersScreen = () => {
   const [ordersList, setOrdersList] = useState<OrderResponse[] | undefined>(
@@ -159,7 +160,7 @@ const OrdersScreen = () => {
                       {/* Formatear fecha */}
                     </PoppinsText>
                   </View>
-                  <PoppinsText>${order.totalPrice.toFixed(2)}</PoppinsText>
+                  <PoppinsText>${formatPrice(order.totalPrice)}</PoppinsText>
                 </View>
                 <View
                   style={{
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 2a9eaf2..d0728a4 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -40,6 +40,7 @@ import {
 } from '@pharmatech/sdk';
 import Button from '../components/Button';
 import { BranchService } from '../services/branches';
+import { formatPrice } from '../utils/formatPrice';
 
 const ProductDetailScreen: React.FC = () => {
   const { id, productId } = useLocalSearchParams<{
@@ -291,7 +292,21 @@ const ProductDetailScreen: React.FC = () => {
     );
   };
 
-  console.log('Current inventory state:', inventory); // Log para inspeccionar el estado de inventory
+  const getProductDiscount = () => {
+    // Busca promo en product.promo
+    if (product?.promo && typeof product.promo.discount === 'number') {
+      return product.promo.discount;
+    }
+    return 0;
+  };
+
+  const getOriginalPrice = () => product?.price ?? 0;
+  const getDiscount = () => getProductDiscount();
+  const getFinalPrice = () => {
+    const original = getOriginalPrice();
+    const discount = getDiscount();
+    return discount > 0 ? (original * (100 - discount)) / 100 : original;
+  };
 
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
@@ -383,10 +398,24 @@ const ProductDetailScreen: React.FC = () => {
           {/* Información del producto */}
           <View style={styles.productInfo}>
             <View style={styles.priceRatingContainer}>
-              <PoppinsText style={styles.price}>$ {product?.price}</PoppinsText>
-              {/* {discount && ( // Comentado */}
-              {/*   <PoppinsText style={styles.discount}>-{discount}%</PoppinsText> */}
-              {/* )} */}
+              {product ? (
+                getDiscount() > 0 ? (
+                  <>
+                    <PoppinsText style={styles.price}>
+                      ${formatPrice(getFinalPrice())}
+                    </PoppinsText>
+                    <PoppinsText style={styles.discountBadge}>
+                      -{getDiscount()}%
+                    </PoppinsText>
+                  </>
+                ) : (
+                  <PoppinsText style={styles.price}>
+                    ${formatPrice(getOriginalPrice())}
+                  </PoppinsText>
+                )
+              ) : (
+                <ActivityIndicator size="small" color={Colors.primary} />
+              )}
             </View>
             <PoppinsText
               style={[
@@ -583,7 +612,26 @@ const ProductDetailScreen: React.FC = () => {
           <CardButton
             size={10}
             getValue={(quantity) => {
-              if (product?.id) updateCartQuantity(product.id, quantity);
+              if (product?.id && quantity > 0) {
+                const promo = product.promo;
+                const discount =
+                  typeof promo?.discount === 'number' ? promo.discount : 0;
+                addToCart({
+                  id: product.id,
+                  name:
+                    product.product.name +
+                    ' ' +
+                    product.presentation.name +
+                    ' ' +
+                    product.presentation.quantity +
+                    ' ' +
+                    product.presentation.measurementUnit,
+                  price: product.price,
+                  quantity,
+                  image: images?.[0]?.url || 'https://via.placeholder.com/150',
+                  discount,
+                });
+              }
             }}
             initialValue={getQuantity()}
           />
@@ -636,6 +684,20 @@ const styles = StyleSheet.create({
     color: Colors.primary,
     marginRight: 10,
   },
+  originalPrice: {
+    fontSize: FontSizes.b1.size,
+    color: Colors.disableText,
+    textDecorationLine: 'line-through',
+    marginRight: 14,
+  },
+  discountBadge: {
+    fontSize: FontSizes.c1.size,
+    backgroundColor: Colors.semanticInfo,
+    borderRadius: 5,
+    padding: 4,
+    color: Colors.textWhite,
+    marginRight: 10,
+  },
   productName: {
     textAlign: 'center',
     fontSize: FontSizes.h5.size,
@@ -698,12 +760,6 @@ const styles = StyleSheet.create({
     alignItems: 'flex-end',
     zIndex: 999,
   },
-  discount: {
-    fontSize: FontSizes.b4.size,
-    backgroundColor: Colors.semanticInfo,
-    borderRadius: 5,
-    padding: 4,
-  },
 });
 
 export default ProductDetailScreen;
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index 8d1e2de..c919820 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -8,6 +8,7 @@ import { Colors, FontSizes } from '../../styles/theme';
 import Carousel from '../../components/Carousel';
 import { ProductService } from '../../services/products';
 import { Product } from '../../types/Product';
+import type { Promo } from '@pharmatech/sdk';
 import EmailVerificationModal from './EmailVerificationModal';
 import { decodeJWT } from '../../helper/jwtHelper';
 
@@ -20,7 +21,7 @@ export default function HomeScreen() {
   const router = useRouter();
   const { showEmailVerification: showEmailVerificationParam } =
     useLocalSearchParams();
-  const { cartItems, addToCart, updateCartQuantity, setCartUserId } = useCart();
+  const { cartItems, updateCartQuantity, setCartUserId } = useCart();
 
   const getItemQuantity = (productId: string) => {
     const cartItem = cartItems.find((item) => item.id === productId.toString());
@@ -63,7 +64,60 @@ export default function HomeScreen() {
       const productsData = await ProductService.getProducts(1, 20);
       if (productsData.success) {
         const pd = productsData.data.results;
-        const carouselProducts = pd.map((p) => ({
+        const carouselProducts = pd.map((p) => {
+          // Usa el descuento real si hay promo, si no, no lo agregues
+          // @ts-expect-error: promo puede estar en p o en p.presentation
+          const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+          const discount: Promo['discount'] | undefined = promo?.discount
+            ? Math.round(promo.discount * 100) / 100
+            : undefined;
+          return {
+            id: p.id,
+            presentationId: p.presentation.id,
+            productId: p.product.id,
+            imageUrl: p.product.images[0].url,
+            name:
+              p.product.name +
+              ' ' +
+              p.presentation.name +
+              ' ' +
+              p.presentation.quantity +
+              ' ' +
+              p.presentation.measurementUnit,
+            category: p.product.categories[0].name,
+            originalPrice: p.price,
+            ...(discount !== undefined ? { discount } : {}),
+            finalPrice: p.price,
+            quantity: getItemQuantity(p.id),
+            getQuantity: (quantity: number) => {
+              updateCartQuantity(p.id, quantity);
+            },
+          };
+        });
+
+        setProducts(carouselProducts);
+      } else {
+        console.log(productsData.error);
+      }
+    } catch (error) {
+      console.error('Error fetching products:', error);
+    } finally {
+      setLoading(false);
+    }
+  };
+
+  const obtainRecommendedProducts = async () => {
+    setLoadingRecommendations(true);
+    try {
+      const recommendations = await ProductService.getRecommendations();
+      const carouselRecommendations = recommendations.results.map((p) => {
+        // Usa el descuento real si hay promo, si no, no lo agregues
+        // @ts-expect-error: promo puede estar en p o en p.presentation
+        const promo: Promo | undefined = p.promo ?? p.presentation.promo;
+        const discount: Promo['discount'] | undefined = promo?.discount
+          ? Math.round(promo.discount * 100) / 100
+          : undefined;
+        return {
           id: p.id,
           presentationId: p.presentation.id,
           productId: p.product.id,
@@ -76,83 +130,16 @@ export default function HomeScreen() {
             p.presentation.quantity +
             ' ' +
             p.presentation.measurementUnit,
-          category: p.product.categories[0].name,
-          //originalPrice: p.price,
-          //discount: 10,
+          category: p.product.categories[0]?.name || 'Sin categoría',
+          originalPrice: p.price,
+          ...(discount !== undefined ? { discount } : {}),
           finalPrice: p.price,
           quantity: getItemQuantity(p.id),
           getQuantity: (quantity: number) => {
-            addToCart({
-              id: p.id,
-              name:
-                p.product.name +
-                ' ' +
-                p.presentation.name +
-                ' ' +
-                p.presentation.quantity +
-                ' ' +
-                p.presentation.measurementUnit,
-              price: p.price,
-              quantity,
-              image:
-                p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
-            });
             updateCartQuantity(p.id, quantity);
           },
-        }));
-
-        setProducts(carouselProducts);
-      } else {
-        console.log(productsData.error);
-      }
-    } catch (error) {
-      console.error('Error fetching products:', error);
-    } finally {
-      setLoading(false);
-    }
-  };
-
-  const obtainRecommendedProducts = async () => {
-    setLoadingRecommendations(true);
-    try {
-      const recommendations = await ProductService.getRecommendations();
-      const carouselRecommendations = recommendations.results.map((p) => ({
-        id: p.id,
-        presentationId: p.presentation.id,
-        productId: p.product.id,
-        imageUrl: p.product.images[0].url,
-        name:
-          p.product.name +
-          ' ' +
-          p.presentation.name +
-          ' ' +
-          p.presentation.quantity +
-          ' ' +
-          p.presentation.measurementUnit,
-        category: p.product.categories[0]?.name || 'Sin categoría',
-        //originalPrice: p.price,
-        //discount: 10,
-        finalPrice: p.price,
-        quantity: getItemQuantity(p.id),
-        getQuantity: (quantity: number) => {
-          addToCart({
-            id: p.id,
-            name:
-              p.product.name +
-              ' ' +
-              p.presentation.name +
-              ' ' +
-              p.presentation.quantity +
-              ' ' +
-              p.presentation.measurementUnit,
-            price: p.price,
-            quantity,
-            image:
-              p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
-          });
-          updateCartQuantity(p.id, quantity);
-        },
-      }));
+        };
+      });
 
       setRecommendedProducts(carouselRecommendations);
     } catch (error) {
diff --git a/src/screens/tab/OffersScreen.tsx b/src/screens/tab/OffersScreen.tsx
index 7a74c8c..adf3708 100644
--- a/src/screens/tab/OffersScreen.tsx
+++ b/src/screens/tab/OffersScreen.tsx
@@ -1,12 +1,141 @@
-import React from 'react';
-import { View, StyleSheet } from 'react-native';
+import React, { useState, useEffect } from 'react';
+import {
+  View,
+  FlatList,
+  StyleSheet,
+  ActivityIndicator,
+  ListRenderItemInfo,
+} from 'react-native';
 import PoppinsText from '../../components/PoppinsText';
-import { Colors } from '../../styles/theme';
+import { Colors, FontSizes } from '../../styles/theme';
+import Card from '../../components/Card';
+import { ProductService } from '../../services/products';
+import type { Promo } from '@pharmatech/sdk';
 
 export default function OffersScreen() {
+  const [offers, setOffers] = useState<
+    Array<{
+      id: string;
+      presentationId: string;
+      productId: string;
+      imageUrl: string;
+      name: string;
+      category: string;
+      originalPrice: number;
+      discount: number;
+      finalPrice: number;
+      quantity: number;
+      getQuantity: (quantity: number) => void;
+    }>
+  >([]);
+  const [loading, setLoading] = useState(false);
+
+  function hasPromo(item: {
+    [key: string]: unknown;
+  }): item is { promo?: Promo } {
+    return 'promo' in item && typeof item.promo !== 'undefined';
+  }
+
+  const loadOffers = async () => {
+    setLoading(true);
+    const res = await ProductService.getProducts(1, 50);
+    if (res.success) {
+      const promoItems = res.data.results.filter(
+        (item) => hasPromo(item) && Boolean(item.promo?.discount),
+      );
+
+      const mappedPromoItems = promoItems.map((p) => {
+        const promo: Promo | undefined = hasPromo(p) ? p.promo : undefined;
+        const discount: Promo['discount'] = promo?.discount ?? 0;
+
+        return {
+          id: p.id,
+          presentationId: p.presentation.id,
+          productId: p.product.id,
+          imageUrl:
+            p.product.images?.[0]?.url || 'https://via.placeholder.com/150',
+          name:
+            p.product.name +
+            ' ' +
+            p.presentation.name +
+            ' ' +
+            p.presentation.quantity +
+            ' ' +
+            p.presentation.measurementUnit,
+          category: p.product.categories?.[0]?.name || 'Sin categoría',
+          originalPrice: p.price,
+          discount,
+          finalPrice: p.price,
+          quantity: 0,
+          getQuantity: () => 0,
+        };
+      });
+      setOffers(mappedPromoItems);
+    } else {
+      console.error('Error al cargar productos:', res.error);
+    }
+    setLoading(false);
+  };
+
+  useEffect(() => {
+    loadOffers();
+  }, []);
+
+  if (loading) {
+    return (
+      <View style={styles.loaderContainer}>
+        <ActivityIndicator size="large" color={Colors.primary} />
+      </View>
+    );
+  }
+
+  const renderOffer = ({
+    item,
+  }: ListRenderItemInfo<{
+    id: string;
+    presentationId: string;
+    productId: string;
+    imageUrl: string;
+    name: string;
+    category: string;
+    originalPrice: number;
+    discount: number;
+    finalPrice: number;
+    quantity: number;
+    getQuantity: (quantity: number) => void;
+  }>) => {
+    return (
+      <Card
+        id={item.id}
+        presentationId={item.presentationId}
+        productId={item.productId}
+        imageUrl={item.imageUrl}
+        name={item.name}
+        category={item.category}
+        originalPrice={item.originalPrice}
+        discount={item.discount}
+        finalPrice={item.finalPrice}
+        quantity={item.quantity}
+        getQuantity={item.getQuantity}
+      />
+    );
+  };
+
   return (
     <View style={styles.container}>
-      <PoppinsText>Pantalla Ofertas</PoppinsText>
+      <PoppinsText weight="medium" style={styles.title}>
+        Ofertas especiales
+      </PoppinsText>
+      <FlatList
+        data={offers}
+        keyExtractor={(item) => item.id}
+        numColumns={2}
+        contentContainerStyle={styles.list}
+        renderItem={renderOffer}
+        columnWrapperStyle={styles.columnWrapper}
+        onRefresh={loadOffers}
+        refreshing={loading}
+      />
       <View style={styles.height} />
     </View>
   );
@@ -14,6 +143,24 @@ export default function OffersScreen() {
 
 const styles = StyleSheet.create({
   container: {
+    flex: 1,
+    backgroundColor: Colors.bgColor,
+    paddingHorizontal: 5,
+  },
+  title: {
+    fontSize: FontSizes.s1.size,
+    color: Colors.textMain,
+    paddingHorizontal: 15,
+  },
+  list: {
+    paddingBottom: 20,
+    justifyContent: 'center',
+    alignItems: 'center',
+  },
+  columnWrapper: {
+    justifyContent: 'space-between',
+  },
+  loaderContainer: {
     flex: 1,
     justifyContent: 'center',
     alignItems: 'center',
diff --git a/src/services/order.ts b/src/services/order.ts
index 81b1f2d..da3c1ae 100644
--- a/src/services/order.ts
+++ b/src/services/order.ts
@@ -26,4 +26,18 @@ export const OrderService = {
       throw new Error(extractErrorMessage(error));
     }
   },
+
+  getById: async (orderId: string) => {
+    try {
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('Token de autenticación no encontrado');
+      }
+      const orderDetail = await api.order.getById(orderId, token);
+      return orderDetail;
+    } catch (error) {
+      console.error('Error en OrderService.getById:', error);
+      throw new Error(extractErrorMessage(error));
+    }
+  },
 };
diff --git a/src/services/paymentConfirmation.ts b/src/services/paymentConfirmation.ts
index 7a8c33e..de25636 100644
--- a/src/services/paymentConfirmation.ts
+++ b/src/services/paymentConfirmation.ts
@@ -24,6 +24,7 @@ export const PaymentConfirmationService = {
         'phoneNumber',
         'bank',
         'reference',
+        'orderId',
       ];
       for (const field of requiredFields) {
         if (!paymentConfirmation[field]) {
diff --git a/src/services/paymentInformation.ts b/src/services/paymentInformation.ts
index bc627ae..6016004 100644
--- a/src/services/paymentInformation.ts
+++ b/src/services/paymentInformation.ts
@@ -13,11 +13,11 @@ export const PaymentInformationService = {
         throw new Error('Token de autenticación no encontrado');
       }
 
-      // Llamar al método findAll con el argumento directamente
+      // Call the API method
       const response = await api.paymentInformation.findAll(paymentMethod);
 
-      // La respuesta ahora es directamente un array de PaymentInfoResponse
-      return [response];
+      // Devolver la respuesta directamente (se asume que ya es un array)
+      return response;
     } catch (error) {
       console.error('Error en PaymentInformationService.findAll:', error);
       throw new Error(extractErrorMessage(error));
diff --git a/src/types/Product.ts b/src/types/Product.ts
index b037903..a759249 100644
--- a/src/types/Product.ts
+++ b/src/types/Product.ts
@@ -5,8 +5,8 @@ export type Product = {
   imageUrl: string;
   name: string;
   category: string;
-  //originalPrice: number;
-  //discount: number;
+  originalPrice?: number;
+  discount?: number;
   finalPrice: number;
   quantity: number;
   getQuantity: (quantity: number) => void;
diff --git a/src/types/api.d.ts b/src/types/api.d.ts
index 1cfae9b..2cf6ed0 100644
--- a/src/types/api.d.ts
+++ b/src/types/api.d.ts
@@ -201,6 +201,7 @@ export interface PaymentConfirmation {
   reference: string;
   documentId: string;
   phoneNumber: string;
+  orderId: string;
 }
 
 export interface PaymentConfirmationResponse extends BaseModel {
diff --git a/src/utils/formatPrice.ts b/src/utils/formatPrice.ts
new file mode 100644
index 0000000..8e0c1e4
--- /dev/null
+++ b/src/utils/formatPrice.ts
@@ -0,0 +1,8 @@
+export function formatPrice(value: number, options?: Intl.NumberFormatOptions) {
+  // Divide entre 100 y muestra con dos decimales
+  return (value / 100).toLocaleString('es-VE', {
+    minimumFractionDigits: 2,
+    maximumFractionDigits: 2,
+    ...options,
+  });
+}

From 2cfdd2046c1c2e9b819f7ce47737433b4784346b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 18:40:26 -0400
Subject: [PATCH 280/291] Update OrderBadge labels and enhance
 OrderDetailScreen with subtotal and discount calculations

---
 src/components/OrderBadge.tsx     |  2 +-
 src/screens/OrderDetailScreen.tsx | 25 +++++++++++++++++++------
 2 files changed, 20 insertions(+), 7 deletions(-)

diff --git a/src/components/OrderBadge.tsx b/src/components/OrderBadge.tsx
index 553eb94..e6caedc 100644
--- a/src/components/OrderBadge.tsx
+++ b/src/components/OrderBadge.tsx
@@ -20,7 +20,7 @@ const STATUS_COLORS: Record<string, string> = {
 
 const STATUS_LABELS: Record<string, string> = {
   requested: 'Pendiente',
-  ready_for_pickup: 'A Enviar',
+  ready_for_pickup: 'A Retirar',
   completed: 'Entregado',
   canceled: 'Cancelado',
   in_progress: 'En Proceso',
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 2a4d39b..d878c64 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -30,6 +30,8 @@ const OrderDetailScreen = () => {
   const [errorMessage, setErrorMessage] = useState('');
   const { addToCart, getItemQuantity, updateCartQuantity } = useCart();
   const router = useRouter();
+  const [subTotal, setSubTotal] = useState(0);
+  const [discount, setDiscount] = useState(0);
 
   const handleReorder = () => {
     order?.details.forEach((detail) => {
@@ -60,6 +62,17 @@ const OrderDetailScreen = () => {
 
         if (order.success) {
           setOrder(order.data);
+
+          setSubTotal(
+            order.data.details.reduce(
+              (acc, t) => acc + t.price * t.quantity,
+              0,
+            ),
+          );
+          setDiscount(
+            order.data.details.reduce((acc, t) => acc + t.discount, 0),
+          );
+          console.log(order);
         }
       } catch (error) {
         console.log(error);
@@ -196,17 +209,17 @@ const OrderDetailScreen = () => {
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Subtotal</PoppinsText>
-            <PoppinsText>${order?.totalPrice}</PoppinsText>
+            <PoppinsText>${subTotal}</PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
-            {/*  <PoppinsText style={{ color: Colors.semanticSuccess }}>
+            <PoppinsText style={{ color: Colors.semanticSuccess }}>
               Descuentos
             </PoppinsText>
-            <PoppinsText style={{ color: Colors.semanticSuccess }}> // Comentado */}
-            {/*   -${order?.totalPrice} */}
-            {/* </PoppinsText> */}
+            <PoppinsText style={{ color: Colors.semanticSuccess }}>
+              -${discount}
+            </PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
@@ -218,7 +231,7 @@ const OrderDetailScreen = () => {
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Total</PoppinsText>
-            <PoppinsText>${order?.totalPrice}</PoppinsText>
+            <PoppinsText>${subTotal - discount}</PoppinsText>
           </View>
         </View>
         <View style={{ marginTop: 20 }}>

From 27f9f698d665bcc2c264f10414f66b07f2bf09c7 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 19:51:03 -0400
Subject: [PATCH 281/291] Fixes for products with no stock

---
 src/components/CardButton.tsx       | 42 +++++++++++++++++++++++++----
 src/screens/ProductDetailScreen.tsx | 41 +++++++++++++++++++++++++++-
 src/screens/tab/HomeScreen.tsx      |  4 ++-
 3 files changed, 80 insertions(+), 7 deletions(-)

diff --git a/src/components/CardButton.tsx b/src/components/CardButton.tsx
index ea62541..1ab08d0 100644
--- a/src/components/CardButton.tsx
+++ b/src/components/CardButton.tsx
@@ -9,6 +9,8 @@ interface CardButtonProps {
   initialValue: number;
   size?: number;
   syncQuantity?: (count: number) => void;
+  disabled?: boolean;
+  showNoStockAlert?: () => void; // <-- nuevo prop opcional
 }
 
 const CardButton: React.FC<CardButtonProps> = ({
@@ -16,6 +18,8 @@ const CardButton: React.FC<CardButtonProps> = ({
   initialValue = 0,
   size = 4,
   syncQuantity,
+  disabled = false, // <-- Valor por defecto
+  showNoStockAlert, // <-- Add this line
 }) => {
   const [count, setCount] = useState(initialValue);
   const [showCounter, setShowCounter] = useState(false);
@@ -38,11 +42,19 @@ const CardButton: React.FC<CardButtonProps> = ({
   }, [initialValue]);
 
   const incrementCount = () => {
+    if (disabled) {
+      if (showNoStockAlert) showNoStockAlert();
+      return;
+    }
     setHasInteracted(true);
     setCount((prev) => prev + 1);
   };
 
   const decrementCount = () => {
+    if (disabled) {
+      if (showNoStockAlert) showNoStockAlert();
+      return;
+    }
     if (count > 0) {
       setHasInteracted(true);
       setCount((prev) => prev - 1);
@@ -50,6 +62,7 @@ const CardButton: React.FC<CardButtonProps> = ({
   };
 
   const showCounterIncrement = () => {
+    if (disabled) return; // <-- No permitir si está deshabilitado
     setShowCounter(true);
     incrementCount();
   };
@@ -58,18 +71,34 @@ const CardButton: React.FC<CardButtonProps> = ({
     <View style={styles.container}>
       {!showCounter ? (
         <TouchableOpacity
-          style={[styles.mainButton, { padding: size }]}
-          onPress={showCounterIncrement}
+          style={[
+            styles.mainButton,
+            { padding: size },
+            disabled && { backgroundColor: Colors.stroke }, // <-- más opaco
+          ]}
+          onPress={() => {
+            if (disabled && showNoStockAlert) showNoStockAlert();
+            else showCounterIncrement();
+          }}
         >
           <PoppinsText style={styles.buttonText}>
             <PlusIcon size={20} color={Colors.textWhite} />
           </PoppinsText>
         </TouchableOpacity>
       ) : (
-        <View style={[styles.counterContainer, { padding: size }]}>
+        <View
+          style={[
+            styles.counterContainer,
+            { padding: size },
+            disabled && { backgroundColor: Colors.stroke },
+          ]}
+        >
           <TouchableOpacity
             style={[styles.counterButton]}
-            onPress={decrementCount}
+            onPress={() => {
+              if (disabled && showNoStockAlert) showNoStockAlert();
+              else decrementCount();
+            }}
           >
             <PoppinsText style={[styles.buttonText]}>
               <MinusIcon size={20} color={Colors.textWhite} />
@@ -80,7 +109,10 @@ const CardButton: React.FC<CardButtonProps> = ({
 
           <TouchableOpacity
             style={[styles.counterButton]}
-            onPress={incrementCount}
+            onPress={() => {
+              if (disabled && showNoStockAlert) showNoStockAlert();
+              else incrementCount();
+            }}
           >
             <PoppinsText style={styles.buttonText}>
               <PlusIcon size={20} color={Colors.textWhite} />
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index d0728a4..816fe4b 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -41,6 +41,7 @@ import {
 import Button from '../components/Button';
 import { BranchService } from '../services/branches';
 import { formatPrice } from '../utils/formatPrice';
+import Alert from '../components/Alerts';
 
 const ProductDetailScreen: React.FC = () => {
   const { id, productId } = useLocalSearchParams<{
@@ -62,6 +63,7 @@ const ProductDetailScreen: React.FC = () => {
   const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
   const [isLoadingInventory, setIsLoadingInventory] = useState(false);
+  const [showNoStockAlert, setShowNoStockAlert] = useState(false);
   const imagesScrollRef = useRef<ScrollView>(null);
   //const discount = 10;
   const router = useRouter();
@@ -308,6 +310,8 @@ const ProductDetailScreen: React.FC = () => {
     return discount > 0 ? (original * (100 - discount)) / 100 : original;
   };
 
+  console.log('Stock actual:', product?.stock);
+
   return (
     <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
       <TopBar />
@@ -339,6 +343,18 @@ const ProductDetailScreen: React.FC = () => {
         </PoppinsText>
       </TouchableOpacity>
       <SafeAreaView style={styles.container}>
+        {/* ALERTA EN LA PARTE SUPERIOR */}
+        {showNoStockAlert && (
+          <View style={styles.alertContainer}>
+            <Alert
+              title="Sin disponibilidad"
+              message="No hay disponibilidad para este producto en este momento."
+              type="warning"
+              onClose={() => setShowNoStockAlert(false)}
+            />
+          </View>
+        )}
+
         <ScrollView>
           {/* Carrusel de imágenes */}
           <ScrollView
@@ -611,11 +627,27 @@ const ProductDetailScreen: React.FC = () => {
         <View style={styles.cardButtonContainer}>
           <CardButton
             size={10}
+            initialValue={getQuantity()}
+            disabled={product ? !product.stock || product.stock === 0 : true}
+            showNoStockAlert={() => setShowNoStockAlert(true)}
             getValue={(quantity) => {
+              const stock = product?.stock ?? 0;
+              // Si no hay stock o la cantidad supera el stock, muestra alerta y no actualices
+              if (stock === 0 || quantity > stock) {
+                setShowNoStockAlert(true);
+                return;
+              }
+              // Si la cantidad es 0, elimina del carrito
+              if (product?.id && quantity === 0) {
+                updateCartQuantity(product.id, 0);
+                return;
+              }
+              // Si hay stock y cantidad válida, agrega o actualiza en el carrito
               if (product?.id && quantity > 0) {
                 const promo = product.promo;
                 const discount =
                   typeof promo?.discount === 'number' ? promo.discount : 0;
+                updateCartQuantity(product.id, quantity);
                 addToCart({
                   id: product.id,
                   name:
@@ -633,7 +665,6 @@ const ProductDetailScreen: React.FC = () => {
                 });
               }
             }}
-            initialValue={getQuantity()}
           />
         </View>
       </SafeAreaView>
@@ -653,6 +684,14 @@ const styles = StyleSheet.create({
     width: width,
     height: 200,
   },
+  alertContainer: {
+    position: 'absolute',
+    width: 326,
+    left: '50%',
+    marginLeft: -163,
+    top: 20,
+    zIndex: 1000,
+  },
   imageIndicators: {
     flexDirection: 'row',
     justifyContent: 'center',
diff --git a/src/screens/tab/HomeScreen.tsx b/src/screens/tab/HomeScreen.tsx
index c919820..92a711f 100644
--- a/src/screens/tab/HomeScreen.tsx
+++ b/src/screens/tab/HomeScreen.tsx
@@ -64,7 +64,9 @@ export default function HomeScreen() {
       const productsData = await ProductService.getProducts(1, 20);
       if (productsData.success) {
         const pd = productsData.data.results;
-        const carouselProducts = pd.map((p) => {
+        // Filtra solo los que tengan stock > 0
+        const availableProducts = pd.filter((p) => p.stock > 0);
+        const carouselProducts = availableProducts.map((p) => {
           // Usa el descuento real si hay promo, si no, no lo agregues
           // @ts-expect-error: promo puede estar en p o en p.presentation
           const promo: Promo | undefined = p.promo ?? p.presentation.promo;

From 4448be3b991f36ef62ce7f2a229d6acefc84abef Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 21:13:13 -0400
Subject: [PATCH 282/291] Refactor notification service to handle token
 retrieval internally

---
 src/hooks/useNotifications.ts | 8 +-------
 src/services/notifications.ts | 9 +++++++--
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/hooks/useNotifications.ts b/src/hooks/useNotifications.ts
index c4a31f3..9e93ba5 100644
--- a/src/hooks/useNotifications.ts
+++ b/src/hooks/useNotifications.ts
@@ -10,7 +10,6 @@ import React, {
 import { NotificationService } from '../services/notifications';
 import { NotificationResponse } from '@pharmatech/sdk';
 import { ServiceResponse } from '../types/api';
-import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 import EventSource from 'react-native-sse';
 import * as SecureStore from 'expo-secure-store';
 import { api } from '../lib/sdkConfig';
@@ -35,9 +34,6 @@ export function NotificationsProvider(props: { children: ReactNode }) {
 
   const refreshNotifications = useCallback(async (): Promise<void> => {
     try {
-      const token = await getUserIdFromSecureStore();
-      if (!token) throw new Error('No se pudo obtener el token.');
-
       const response: ServiceResponse<
         NotificationResponse | NotificationResponse[]
       > = await NotificationService.getNotifications();
@@ -63,9 +59,7 @@ export function NotificationsProvider(props: { children: ReactNode }) {
 
   const markAsRead = useCallback(async (notificationId: string) => {
     try {
-      const token = await getUserIdFromSecureStore();
-      if (!token) throw new Error('No se pudo obtener el token.');
-      await NotificationService.markAsRead(notificationId, token);
+      await NotificationService.markAsRead(notificationId);
       // optimismo: actualizamos localmente
       setNotifications((prev) =>
         prev.map((n) => (n.id === notificationId ? { ...n, isRead: true } : n)),
diff --git a/src/services/notifications.ts b/src/services/notifications.ts
index ec305fc..a85d05b 100644
--- a/src/services/notifications.ts
+++ b/src/services/notifications.ts
@@ -24,9 +24,14 @@ export const NotificationService = {
       };
     }
   },
-  markAsRead: async (orderId: string, jwt: string): Promise<void> => {
+  markAsRead: async (orderId: string): Promise<void> => {
     try {
-      await api.notification.markAsRead(orderId, jwt);
+      const token = await SecureStore.getItemAsync('auth_token');
+      if (!token) {
+        throw new Error('No se encontró el token de autenticación');
+      }
+
+      await api.notification.markAsRead(orderId, token);
     } catch (error) {
       throw new Error(extractErrorMessage(error));
     }

From 0f074f10fb6a8ea0ff08d12de98ba5e8253ced8b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 21:17:58 -0400
Subject: [PATCH 283/291] Remove token retrieval from NotificationsScreen to
 streamline notification fetching

---
 src/screens/NotificationsScreen.tsx | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/src/screens/NotificationsScreen.tsx b/src/screens/NotificationsScreen.tsx
index b2b9021..f644e49 100644
--- a/src/screens/NotificationsScreen.tsx
+++ b/src/screens/NotificationsScreen.tsx
@@ -21,7 +21,6 @@ import PoppinsText from '../components/PoppinsText';
 import Alert from '../components/Alerts';
 import { Colors, FontSizes } from '../styles/theme';
 import { NotificationService } from '../services/notifications';
-import { getUserIdFromSecureStore } from '../helper/jwtHelper';
 import { SvgProps } from 'react-native-svg';
 
 // Importa tus SVG como componentes React
@@ -79,9 +78,6 @@ export default function NotificationsScreen() {
       setLoading(true);
       setShowErrorAlert(false);
       try {
-        const token = await getUserIdFromSecureStore();
-        if (!token) throw new Error('No se pudo obtener el token de usuario.');
-
         const res = await NotificationService.getNotifications();
         if (!res.success || !Array.isArray(res.data)) {
           const errorMsg =
@@ -123,14 +119,11 @@ export default function NotificationsScreen() {
     useCallback(() => {
       const markAllRead = async () => {
         try {
-          const token = await getUserIdFromSecureStore();
-          if (!token) return;
-
           const toMark = notificationsList.filter((n) => !n.isRead);
           if (toMark.length === 0) return;
 
           await Promise.all(
-            toMark.map((n) => NotificationService.markAsRead(n.orderId, token)),
+            toMark.map((n) => NotificationService.markAsRead(n.orderId)),
           );
           setNotificationsList((prev) =>
             prev.map((n) => ({ ...n, isRead: true })),

From 973998e5bfe09b8950fecaf28d51976df1ca055b Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 21:30:10 -0400
Subject: [PATCH 284/291] Calculate discount based on price and quantity in
 OrderDetailScreen

---
 src/screens/OrderDetailScreen.tsx | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index 3e7c45b..b92d934 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -70,7 +70,10 @@ const OrderDetailScreen = () => {
             ),
           );
           setDiscount(
-            order.data.details.reduce((acc, t) => acc + t.discount, 0),
+            order.data.details.reduce(
+              (acc, t) => acc + ((t.price * t.discount) / 100) * t.quantity,
+              0,
+            ),
           );
           console.log(order);
         }

From d6a15666712960b30e6a6a23bcab2bb3a0010762 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 21:46:43 -0400
Subject: [PATCH 285/291] Update OrderDetailScreen to display full product
 details and correct navigation path

---
 src/screens/OrderDetailScreen.tsx | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index b92d934..cf8df62 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -174,7 +174,13 @@ const OrderDetailScreen = () => {
               </View>
               <View style={{ flex: 1 }}>
                 <PoppinsText>
-                  {detail.productPresentation.presentation.name}
+                  {detail.productPresentation.product.name +
+                    ' ' +
+                    detail.productPresentation.presentation.name +
+                    ' ' +
+                    detail.productPresentation.presentation.quantity +
+                    ' ' +
+                    detail.productPresentation.presentation.measurementUnit}
                 </PoppinsText>
                 <View
                   style={{
@@ -190,7 +196,9 @@ const OrderDetailScreen = () => {
                   <StarIcon color={Colors.gray_100} />
                   <TouchableOpacity
                     onPress={() =>
-                      router.push(`products/${detail.productPresentation.id}`)
+                      router.push(
+                        `products/${detail.productPresentation.product.id}/presentation/${detail.productPresentation.presentation.id}`,
+                      )
                     }
                   >
                     <PoppinsText>Ir al producto</PoppinsText>

From d71673578b134d7621e430f0212d30cd86df897c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 22:11:23 -0400
Subject: [PATCH 286/291] Height styles

---
 src/screens/DirectionScreen.tsx | 4 ++++
 src/screens/MenuScreen.tsx      | 4 ++++
 src/screens/OrdersScreen.tsx    | 4 ++++
 3 files changed, 12 insertions(+)

diff --git a/src/screens/DirectionScreen.tsx b/src/screens/DirectionScreen.tsx
index 8649dc8..0a0f58a 100644
--- a/src/screens/DirectionScreen.tsx
+++ b/src/screens/DirectionScreen.tsx
@@ -189,6 +189,7 @@ const DirectionScreen = () => {
         }}
         onClose={() => setShowDeletePopup(false)}
       />
+      <View style={styles.height} />
     </ScrollView>
   );
 };
@@ -200,6 +201,9 @@ const styles = StyleSheet.create({
     padding: 20,
     paddingTop: -20,
   },
+  height: {
+    height: 64,
+  },
   alertContainer: {
     position: 'absolute',
     width: 326,
diff --git a/src/screens/MenuScreen.tsx b/src/screens/MenuScreen.tsx
index 78ba921..47df5a4 100644
--- a/src/screens/MenuScreen.tsx
+++ b/src/screens/MenuScreen.tsx
@@ -179,6 +179,7 @@ export default function MenuScreen() {
               </TouchableOpacity>
             </View>
           </View>
+          <View style={styles.height} />
         </SafeAreaView>
       </View>
 
@@ -209,6 +210,9 @@ const styles = StyleSheet.create({
     zIndex: 100,
     elevation: 10,
   },
+  height: {
+    height: 64,
+  },
   safeArea: {
     flex: 1,
   },
diff --git a/src/screens/OrdersScreen.tsx b/src/screens/OrdersScreen.tsx
index 5433cbf..d2865b8 100644
--- a/src/screens/OrdersScreen.tsx
+++ b/src/screens/OrdersScreen.tsx
@@ -188,6 +188,7 @@ const OrdersScreen = () => {
               </View>
             </View>
           ))}
+        <View style={styles.height} />
       </View>
     </ScrollView>
   );
@@ -200,6 +201,9 @@ const styles = StyleSheet.create({
     padding: 20,
     paddingTop: -20,
   },
+  height: {
+    height: 64,
+  },
   alertContainer: {
     position: 'absolute',
     width: 326,

From ed1b775bb43f07cc4f4f7800755fa9af7f5323b6 Mon Sep 17 00:00:00 2001
From: jsayago77 <jsayago.dev@gmail.com>
Date: Thu, 29 May 2025 22:41:10 -0400
Subject: [PATCH 287/291] Fix translation for 'ready_for_pickup' status and
 enhance OrderTrackingScreen with delivery details and map functionality

---
 src/screens/ActiveOrdersScreen.tsx  |  2 +-
 src/screens/OrderTrackingScreen.tsx | 51 +++++++++++++++++++++++++++--
 2 files changed, 49 insertions(+), 4 deletions(-)

diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 9cbaf36..917b2a9 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -16,7 +16,7 @@ import { truncateString } from '../utils/commons';
 
 const STATUS_LABELS: Record<string, string> = {
   requested: 'Pendiente',
-  ready_for_pickup: 'A Enviar',
+  ready_for_pickup: 'A Retirar',
   in_progress: 'En Proceso',
   approved: 'Aprobado',
 };
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index c4f408f..4573e02 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -10,7 +10,12 @@ import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import { useLocalSearchParams } from 'expo-router';
 import Alert from '../components/Alerts';
-import { OrderDetailedResponse, OrderStatus } from '@pharmatech/sdk';
+import {
+  OrderDeliveryDetailedResponse,
+  OrderDeliveryStatus,
+  OrderDetailedResponse,
+  OrderStatus,
+} from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
 import * as SecureStore from 'expo-secure-store';
@@ -28,6 +33,10 @@ import io from 'socket.io-client';
 import { SOCKET_URL } from '../lib/socketUrl';
 import VerticalStepper from '../components/VerticalStepper';
 import { DeliveryService } from '../services/delivery';
+import Button from '../components/Button';
+import DeliveryMap from '../components/DeliveryMap';
+import { useSelector } from 'react-redux';
+import { RootState } from '../redux/store';
 
 const OrderTrackingScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -42,6 +51,14 @@ const OrderTrackingScreen = () => {
   const [step, setStep] = useState(0);
   const [refreshing, setRefreshing] = useState<boolean>(false);
   const [userAddress, setUserAddress] = useState('');
+  const [delivery, setDelivery] = useState<
+    OrderDeliveryDetailedResponse | undefined
+  >();
+  const [showMap, setShowMap] = useState(false);
+
+  const deliveryState = useSelector(
+    (state: RootState) => state.delivery.deliveryState[id as string] || 0,
+  );
 
   const changeTrackingStatus = (status: OrderStatus) => {
     switch (status) {
@@ -77,6 +94,7 @@ const OrderTrackingScreen = () => {
           const delivery = await DeliveryService.getOrderDetails(
             order.data.orderDeliveries[0].id,
           );
+          setDelivery(delivery);
           setUserAddress(
             delivery.address.adress + '. \n' + delivery.address.referencePoint,
           );
@@ -268,9 +286,37 @@ const OrderTrackingScreen = () => {
               </>
             )}
           </View>
-          <View style={{ marginVertical: 20 }}>
+          <View style={{ marginVertical: 10 }}>
             <VerticalStepper steps={steps} currentStep={step} />
           </View>
+          {order?.type != 'pickup' &&
+            !showMap &&
+            order.status === OrderStatus.READY_FOR_PICKUP &&
+            order.orderDeliveries[0].deliveryStatus ===
+              OrderDeliveryStatus.ASSIGNED && (
+              <View style={{ marginVertical: 15 }}>
+                <Button
+                  title="Ver Mapa"
+                  onPress={() => setShowMap(true)}
+                  variant={'primary'}
+                />
+              </View>
+            )}
+          {showMap && (
+            <View style={{ flex: 1, height: 300 }}>
+              <DeliveryMap
+                deliveryState={deliveryState}
+                branchLocation={
+                  order?.branch as { latitude: number; longitude: number }
+                }
+                customerLocation={
+                  delivery?.address as { latitude: number; longitude: number }
+                }
+                deliveryLocation={null}
+                style={{ height: 300, marginBottom: 16 }}
+              />
+            </View>
+          )}
           <View>
             <View
               style={{
@@ -369,7 +415,6 @@ const styles = StyleSheet.create({
   },
   orderHeader: {
     alignItems: 'center',
-    marginTop: 30,
     marginBottom: 15,
   },
   orderInfo: {

From 57ed903e137c7357a27dbd04bc039d35fb92b6b4 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 23:31:24 -0400
Subject: [PATCH 288/291] Showing delivery map to client

---
 src/components/DeliveryMap.tsx      |  43 +++++++-
 src/screens/OrderTrackingScreen.tsx | 163 ++++++++++++++++++----------
 2 files changed, 142 insertions(+), 64 deletions(-)

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index 5ba7b4d..cb68515 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -3,6 +3,7 @@ import MapView, { Marker, Polyline } from 'react-native-maps';
 import { StyleSheet, View, ActivityIndicator, ViewStyle } from 'react-native';
 import { Config } from '../config';
 import { Colors } from '../styles/theme';
+import PoppinsText from '../components/PoppinsText';
 
 interface DeliveryMapProps {
   deliveryState: number;
@@ -25,7 +26,7 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
   const [customerRouteCoordinates, setCustomerRouteCoordinates] = useState<
     { latitude: number; longitude: number }[]
   >([]);
-  const [isLoading, setIsLoading] = useState(true); // Estado de carga
+  const [, setIsLoading] = useState(true); // Estado de carga
 
   // Obtener la ruta desde Google Maps Directions API
   const fetchRoute = async (
@@ -144,8 +145,13 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     return points;
   };
 
-  if (isLoading) {
-    // Mostrar un indicador de carga mientras se obtienen los datos
+  if (
+    // Solo espera si faltan datos críticos
+    branchLocation.latitude === 0 ||
+    branchLocation.longitude === 0 ||
+    customerLocation.latitude === 0 ||
+    customerLocation.longitude === 0
+  ) {
     return (
       <View style={[styles.loadingContainer, style]}>
         <ActivityIndicator size="large" color={Colors.primary} />
@@ -153,10 +159,11 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
     );
   }
 
+  // Mostrar el mapa aunque deliveryLocation sea null
   return (
     <View style={[styles.container, style]}>
       <MapView
-        style={StyleSheet.absoluteFillObject} // Asegura que el mapa ocupe todo el contenedor
+        style={StyleSheet.absoluteFillObject}
         initialRegion={{
           latitude: branchLocation.latitude || 0,
           longitude: branchLocation.longitude || 0,
@@ -164,11 +171,11 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           longitudeDelta: 0.05,
         }}
       >
-        {/* Mostrar la ubicación del delivery */}
+        {/* Mostrar la ubicación del delivery si existe */}
         {deliveryLocation && (
           <Marker
             coordinate={deliveryLocation}
-            title="Tu ubicación"
+            title="Repartidor"
             pinColor="red"
           />
         )}
@@ -210,6 +217,30 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
           />
         )}
       </MapView>
+      {!deliveryLocation && (
+        <View
+          style={{
+            position: 'absolute',
+            bottom: 32,
+            left: 16,
+            right: 16,
+            alignItems: 'center',
+            backgroundColor: Colors.textWhite,
+            borderRadius: 16,
+            paddingVertical: 12,
+            paddingHorizontal: 20,
+            shadowColor: '#000',
+            shadowOffset: { width: 0, height: 2 },
+            shadowOpacity: 0.15,
+            shadowRadius: 6,
+            elevation: 4,
+          }}
+        >
+          <PoppinsText style={{ color: Colors.primary }}>
+            Esperando ubicación del repartidor...
+          </PoppinsText>
+        </View>
+      )}
     </View>
   );
 };
diff --git a/src/screens/OrderTrackingScreen.tsx b/src/screens/OrderTrackingScreen.tsx
index 4573e02..8470eb0 100644
--- a/src/screens/OrderTrackingScreen.tsx
+++ b/src/screens/OrderTrackingScreen.tsx
@@ -5,6 +5,8 @@ import {
   ScrollView,
   ActivityIndicator,
   RefreshControl,
+  Modal,
+  TouchableOpacity,
 } from 'react-native';
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
@@ -12,13 +14,11 @@ import { useLocalSearchParams } from 'expo-router';
 import Alert from '../components/Alerts';
 import {
   OrderDeliveryDetailedResponse,
-  OrderDeliveryStatus,
   OrderDetailedResponse,
   OrderStatus,
 } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { formatDate, truncateString } from '../utils/commons';
-import * as SecureStore from 'expo-secure-store';
 import {
   CubeIcon,
   PhoneIcon,
@@ -28,15 +28,19 @@ import {
 import {
   BuildingStorefrontIcon,
   MapPinIcon,
+  XMarkIcon,
 } from 'react-native-heroicons/solid';
-import io from 'socket.io-client';
-import { SOCKET_URL } from '../lib/socketUrl';
 import VerticalStepper from '../components/VerticalStepper';
 import { DeliveryService } from '../services/delivery';
 import Button from '../components/Button';
 import DeliveryMap from '../components/DeliveryMap';
 import { useSelector } from 'react-redux';
 import { RootState } from '../redux/store';
+import {
+  initializeSocket,
+  disconnectSocket,
+} from '../lib/deliverySocket/deliverySocket';
+import { Socket } from 'socket.io-client';
 
 const OrderTrackingScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -54,7 +58,13 @@ const OrderTrackingScreen = () => {
   const [delivery, setDelivery] = useState<
     OrderDeliveryDetailedResponse | undefined
   >();
-  const [showMap, setShowMap] = useState(false);
+  const [isMapModalVisible, setIsMapModalVisible] = useState(false);
+
+  // Estado para la ubicación del repartidor
+  const [deliveryLocation, setDeliveryLocation] = useState<{
+    latitude: number;
+    longitude: number;
+  } | null>(null);
 
   const deliveryState = useSelector(
     (state: RootState) => state.delivery.deliveryState[id as string] || 0,
@@ -85,7 +95,6 @@ const OrderTrackingScreen = () => {
   const fetchOrder = async () => {
     try {
       const order = await UserService.getOrder(id);
-      console.log(order);
       if (order.success) {
         if (
           order.data.orderDeliveries &&
@@ -103,7 +112,7 @@ const OrderTrackingScreen = () => {
         changeTrackingStatus(order.data.status);
       }
     } catch (error) {
-      console.log(error);
+      console.error('Error al obtener la orden:', error);
       setErrorMessage('Ocurrió un error');
       setShowErrorAlert(true);
     } finally {
@@ -113,47 +122,64 @@ const OrderTrackingScreen = () => {
   };
 
   useEffect(() => {
-    if (id) {
-      fetchOrder();
+    let socket: Socket;
+
+    const setupSocket = async () => {
+      try {
+        socket = await initializeSocket();
+        socket.connect();
 
-      const socket = io(SOCKET_URL, {
-        autoConnect: false,
-        transports: ['polling'],
-        transportOptions: {
-          polling: {
-            extraHeaders: {
-              authorization: `Bearer ${SecureStore.getItemAsync('auth_token')}`,
-            },
+        socket.on('connect', () => {
+          console.log('WebSocket conectado en OrderTrackingScreen');
+        });
+
+        socket.on(
+          'coordinatesUpdated',
+          (data: { latitude: number; longitude: number }) => {
+            setDeliveryLocation({
+              latitude: data.latitude,
+              longitude: data.longitude,
+            });
           },
-        },
-      });
+        );
 
-      function onOrderUpdated(order: { orderId: string; status: OrderStatus }) {
-        if (order.orderId === id) {
-          changeTrackingStatus(order.status);
-        }
-      }
+        socket.on('connect_error', (error) => {
+          console.error(
+            'Error de conexión al WebSocket en OrderTrackingScreen:',
+            error,
+          );
+        });
 
-      socket.connect();
-      socket.on('orderUpdated', onOrderUpdated);
+        socket.on('disconnect', (reason) => {
+          console.warn(
+            'WebSocket desconectado en OrderTrackingScreen. Razón:',
+            reason,
+          );
+        });
+      } catch (error) {
+        console.error(
+          'Error configurando el WebSocket en OrderTrackingScreen:',
+          error,
+        );
+      }
+    };
 
-      socket.on('connect_error', (err) =>
-        console.log('[WS] Error en handshake:', err.message),
-      );
+    setupSocket();
 
-      socket.on('connect', () =>
-        console.log('[WS] Conectado con ID:', socket.id),
-      );
-      socket.on('disconnect', (reason) =>
-        console.log('[WS] Desconectado por:', reason),
-      );
+    return () => {
+      if (socket) {
+        socket.off('coordinatesUpdated');
+        disconnectSocket();
+      }
+    };
+  }, [id]);
+  // --- FIN INTEGRACIÓN WEBSOCKET ---
 
-      return () => {
-        socket.off('orderUpdated', onOrderUpdated);
-        socket.disconnect();
-      };
+  useEffect(() => {
+    if (id) {
+      fetchOrder();
     }
-  }, []);
+  }, [id]);
 
   if (loading) {
     return (
@@ -289,21 +315,37 @@ const OrderTrackingScreen = () => {
           <View style={{ marginVertical: 10 }}>
             <VerticalStepper steps={steps} currentStep={step} />
           </View>
-          {order?.type != 'pickup' &&
-            !showMap &&
-            order.status === OrderStatus.READY_FOR_PICKUP &&
-            order.orderDeliveries[0].deliveryStatus ===
-              OrderDeliveryStatus.ASSIGNED && (
-              <View style={{ marginVertical: 15 }}>
-                <Button
-                  title="Ver Mapa"
-                  onPress={() => setShowMap(true)}
-                  variant={'primary'}
-                />
-              </View>
-            )}
-          {showMap && (
-            <View style={{ flex: 1, height: 300 }}>
+          {/* Botón para abrir el mapa ampliado */}
+          {order?.type !== 'pickup' && (
+            <Button
+              title="Ver mapa ampliado"
+              onPress={() => setIsMapModalVisible(true)}
+              variant={'primary'}
+              style={{ marginBottom: 12 }}
+            />
+          )}
+          {/* Modal para el mapa ampliado */}
+          <Modal
+            visible={isMapModalVisible}
+            animationType="slide"
+            transparent={true}
+            onRequestClose={() => setIsMapModalVisible(false)}
+          >
+            <View style={{ flex: 1, backgroundColor: Colors.bgColor }}>
+              <TouchableOpacity
+                style={{
+                  position: 'absolute',
+                  top: 16,
+                  right: 16,
+                  zIndex: 10,
+                  backgroundColor: Colors.textWhite,
+                  padding: 8,
+                  borderRadius: 16,
+                }}
+                onPress={() => setIsMapModalVisible(false)}
+              >
+                <XMarkIcon size={24} color={Colors.textMain} />
+              </TouchableOpacity>
               <DeliveryMap
                 deliveryState={deliveryState}
                 branchLocation={
@@ -312,11 +354,12 @@ const OrderTrackingScreen = () => {
                 customerLocation={
                   delivery?.address as { latitude: number; longitude: number }
                 }
-                deliveryLocation={null}
-                style={{ height: 300, marginBottom: 16 }}
+                deliveryLocation={deliveryLocation}
+                style={{ flex: 1 }}
               />
             </View>
-          )}
+          </Modal>
+          {/* Información de contacto y otros datos... */}
           <View>
             <View
               style={{
@@ -394,6 +437,7 @@ const OrderTrackingScreen = () => {
           </View>
         </View>
       )}
+      <View style={styles.height} />
     </ScrollView>
   );
 };
@@ -404,6 +448,9 @@ const styles = StyleSheet.create({
     backgroundColor: Colors.bgColor,
     padding: 20,
   },
+  height: {
+    height: 64,
+  },
   alertContainer: {
     position: 'absolute',
     width: 326,

From 6f2bc67bf9cc61e64222d3c96560c022980f1218 Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Thu, 29 May 2025 23:48:03 -0400
Subject: [PATCH 289/291] Adding more cent prices and eliminating stars rating

---
 src/screens/ActiveOrdersScreen.tsx  |  3 +-
 src/screens/OrderDetailScreen.tsx   | 12 ++---
 src/screens/ProductDetailScreen.tsx | 74 +++++++++++++----------------
 3 files changed, 42 insertions(+), 47 deletions(-)

diff --git a/src/screens/ActiveOrdersScreen.tsx b/src/screens/ActiveOrdersScreen.tsx
index 917b2a9..8b14053 100644
--- a/src/screens/ActiveOrdersScreen.tsx
+++ b/src/screens/ActiveOrdersScreen.tsx
@@ -13,6 +13,7 @@ import Alert from '../components/Alerts';
 import { OrderResponse } from '@pharmatech/sdk';
 import { UserService } from '../services/user';
 import { truncateString } from '../utils/commons';
+import { formatPrice } from '../utils/formatPrice';
 
 const STATUS_LABELS: Record<string, string> = {
   requested: 'Pendiente',
@@ -141,7 +142,7 @@ const ActiveOrdersScreen = () => {
                       {new Date(order.createdAt).toLocaleDateString()}
                     </PoppinsText>
                   </View>
-                  <PoppinsText>${order.totalPrice.toFixed(2)}</PoppinsText>
+                  <PoppinsText>${formatPrice(order.totalPrice)}</PoppinsText>
                 </View>
                 <View
                   style={{
diff --git a/src/screens/OrderDetailScreen.tsx b/src/screens/OrderDetailScreen.tsx
index cf8df62..e8cd074 100644
--- a/src/screens/OrderDetailScreen.tsx
+++ b/src/screens/OrderDetailScreen.tsx
@@ -10,13 +10,13 @@ import {
 import { Colors, FontSizes } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
 import Button from '../components/Button';
-import { StarIcon } from 'react-native-heroicons/solid';
 import Alert from '../components/Alerts';
 import { UserService } from '../services/user';
 import { useRouter, useLocalSearchParams } from 'expo-router';
 import { OrderDetailedResponse } from '@pharmatech/sdk';
 import { truncateString } from '../utils/commons';
 import { useCart } from '../hooks/useCart';
+import { formatPrice } from '../utils/formatPrice';
 
 const OrderDetailScreen = () => {
   const { id } = useLocalSearchParams<{ id: string }>();
@@ -189,11 +189,11 @@ const OrderDetailScreen = () => {
                     margin: 10,
                   }}
                 >
-                  <PoppinsText>${detail.subtotal}</PoppinsText>
+                  <PoppinsText>${formatPrice(detail.subtotal)}</PoppinsText>
                   <PoppinsText>Cantidad: {detail.quantity}</PoppinsText>
                 </View>
                 <View style={{ flexDirection: 'row', alignContent: 'center' }}>
-                  <StarIcon color={Colors.gray_100} />
+                  {/* <StarIcon color={Colors.gray_100} /> */}
                   <TouchableOpacity
                     onPress={() =>
                       router.push(
@@ -220,7 +220,7 @@ const OrderDetailScreen = () => {
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Subtotal</PoppinsText>
-            <PoppinsText>${subTotal}</PoppinsText>
+            <PoppinsText>${formatPrice(subTotal)}</PoppinsText>
           </View>
           <View
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
@@ -229,7 +229,7 @@ const OrderDetailScreen = () => {
               Descuentos
             </PoppinsText>
             <PoppinsText style={{ color: Colors.semanticSuccess }}>
-              -${discount}
+              -${formatPrice(discount)}
             </PoppinsText>
           </View>
           <View
@@ -242,7 +242,7 @@ const OrderDetailScreen = () => {
             style={{ flexDirection: 'row', justifyContent: 'space-between' }}
           >
             <PoppinsText>Total</PoppinsText>
-            <PoppinsText>${subTotal - discount}</PoppinsText>
+            <PoppinsText>${formatPrice(subTotal - discount)}</PoppinsText>
           </View>
         </View>
         <View style={{ marginTop: 20 }}>
diff --git a/src/screens/ProductDetailScreen.tsx b/src/screens/ProductDetailScreen.tsx
index 816fe4b..80c2f73 100644
--- a/src/screens/ProductDetailScreen.tsx
+++ b/src/screens/ProductDetailScreen.tsx
@@ -15,11 +15,7 @@ import { useRouter, useLocalSearchParams } from 'expo-router';
 import TopBar from '../components/TopBar';
 import { useCart } from '../hooks/useCart';
 import { Product as CardProduct } from '../types/Product';
-import {
-  CheckCircleIcon,
-  StarIcon,
-  ChevronLeftIcon,
-} from 'react-native-heroicons/solid';
+import { CheckCircleIcon, ChevronLeftIcon } from 'react-native-heroicons/solid';
 import { Colors, FontSizes } from '../styles/theme';
 import Dropdown from '../components/Dropdown';
 import CardButton from '../components/CardButton';
@@ -59,8 +55,6 @@ const ProductDetailScreen: React.FC = () => {
   const [presentations, setPresentations] =
     useState<ProductPresentationResponse[]>();
   const [products, setProducts] = useState<CardProduct[]>([]);
-  const [userRating, setUserRating] = useState<number>(0);
-  const [hoverRating, setHoverRating] = useState<number>(0);
   const [currentImageIndex, setCurrentImageIndex] = useState<number>(0);
   const [isLoadingInventory, setIsLoadingInventory] = useState(false);
   const [showNoStockAlert, setShowNoStockAlert] = useState(false);
@@ -262,37 +256,37 @@ const ProductDetailScreen: React.FC = () => {
     }
   };
 
-  const handleRating = (rating: number) => {
-    setUserRating(rating);
-    // Aquí podrías enviar la calificación a tu API
-    console.log('Calificación enviada:', rating);
-  };
-
-  const RatingStars = () => {
-    return (
-      <View style={styles.ratingStarsContainer}>
-        {[1, 2, 3, 4, 5].map((star) => (
-          <TouchableOpacity
-            key={star}
-            activeOpacity={0.7}
-            onPress={() => handleRating(star)}
-            onPressIn={() => setHoverRating(star)}
-            onPressOut={() => setHoverRating(0)}
-          >
-            <StarIcon
-              size={32}
-              color={
-                star <= (hoverRating || userRating)
-                  ? Colors.semanticWarning
-                  : Colors.gray_100
-              }
-              style={styles.starIcon}
-            />
-          </TouchableOpacity>
-        ))}
-      </View>
-    );
-  };
+  // const handleRating = (rating: number) => {
+  //   setUserRating(rating);
+  //   // Aquí podrías enviar la calificación a tu API
+  //   console.log('Calificación enviada:', rating);
+  // };
+
+  // const RatingStars = () => {
+  //   return (
+  //     <View style={styles.ratingStarsContainer}>
+  //       {[1, 2, 3, 4, 5].map((star) => (
+  //         <TouchableOpacity
+  //           key={star}
+  //           activeOpacity={0.7}
+  //           onPress={() => handleRating(star)}
+  //           onPressIn={() => setHoverRating(star)}
+  //           onPressOut={() => setHoverRating(0)}
+  //         >
+  //           <StarIcon
+  //             size={32}
+  //             color={
+  //               star <= (hoverRating || userRating)
+  //                 ? Colors.semanticWarning
+  //                 : Colors.gray_100
+  //             }
+  //             style={styles.starIcon}
+  //           />
+  //         </TouchableOpacity>
+  //       ))}
+  //     </View>
+  //   );
+  // };
 
   const getProductDiscount = () => {
     // Busca promo en product.promo
@@ -399,13 +393,13 @@ const ProductDetailScreen: React.FC = () => {
             )}
           </PoppinsText>
 
-          <RatingStars />
+          {/* <RatingStars />
           {userRating > 0 && (
             <PoppinsText style={styles.ratingFeedback}>
               ¡Gracias por tu calificación de {userRating} estrella
               {userRating !== 1 ? 's' : ''}!
             </PoppinsText>
-          )}
+          )} */}
 
           <PoppinsText style={styles.description}>
             {product?.presentation.description}

From 8cbdb10705d7f105af9d2348a28632f5631f935c Mon Sep 17 00:00:00 2001
From: miglesiasDev <1001.28391672.ucla@gmail.com>
Date: Fri, 30 May 2025 00:14:06 -0400
Subject: [PATCH 290/291] Using icons for delivery maps

---
 src/components/DeliveryMap.tsx | 26 +++++++++++---------------
 src/components/HistoryMap.tsx  | 28 +++++++++++++---------------
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/src/components/DeliveryMap.tsx b/src/components/DeliveryMap.tsx
index cb68515..2ce4eee 100644
--- a/src/components/DeliveryMap.tsx
+++ b/src/components/DeliveryMap.tsx
@@ -4,6 +4,8 @@ import { StyleSheet, View, ActivityIndicator, ViewStyle } from 'react-native';
 import { Config } from '../config';
 import { Colors } from '../styles/theme';
 import PoppinsText from '../components/PoppinsText';
+import { MapPinIcon, UserIcon } from 'react-native-heroicons/solid';
+import { FontAwesome5 } from '@expo/vector-icons';
 
 interface DeliveryMapProps {
   deliveryState: number;
@@ -173,30 +175,24 @@ const DeliveryMap: React.FC<DeliveryMapProps> = ({
       >
         {/* Mostrar la ubicación del delivery si existe */}
         {deliveryLocation && (
-          <Marker
-            coordinate={deliveryLocation}
-            title="Repartidor"
-            pinColor="red"
-          />
+          <Marker coordinate={deliveryLocation} title="Repartidor">
+            <FontAwesome5 name="motorcycle" size={26} color={Colors.primary} />
+          </Marker>
         )}
 
         {/* Mostrar la ubicación de la sucursal */}
         {branchLocation.latitude !== 0 && branchLocation.longitude !== 0 && (
-          <Marker
-            coordinate={branchLocation}
-            title="Sucursal de origen"
-            pinColor="blue"
-          />
+          <Marker coordinate={branchLocation} title="Sucursal de origen">
+            <MapPinIcon size={32} color={Colors.primary} />
+          </Marker>
         )}
 
         {/* Mostrar la ubicación del cliente */}
         {customerLocation.latitude !== 0 &&
           customerLocation.longitude !== 0 && (
-            <Marker
-              coordinate={customerLocation}
-              title="Ubicación del cliente"
-              pinColor="green"
-            />
+            <Marker coordinate={customerLocation} title="Ubicación del cliente">
+              <UserIcon size={32} color={Colors.primary} />
+            </Marker>
           )}
 
         {/* Mostrar la ruta hacia la sucursal */}
diff --git a/src/components/HistoryMap.tsx b/src/components/HistoryMap.tsx
index ba62402..0f0d229 100644
--- a/src/components/HistoryMap.tsx
+++ b/src/components/HistoryMap.tsx
@@ -2,6 +2,10 @@ import React, { useEffect, useState } from 'react';
 import MapView, { Marker, Polyline } from 'react-native-maps';
 import { StyleSheet, View, Alert, ViewStyle } from 'react-native';
 import { Config } from '../config';
+import { Colors } from '../styles/theme';
+
+import { MapPinIcon, UserIcon } from 'react-native-heroicons/solid';
+import { FontAwesome5 } from '@expo/vector-icons';
 
 interface HistoryMapProps {
   deliveryLocation: { latitude: number; longitude: number };
@@ -131,25 +135,19 @@ const HistoryMap: React.FC<HistoryMapProps> = ({
         }}
       >
         {/* Mostrar la ubicación del delivery */}
-        <Marker
-          coordinate={deliveryLocation}
-          title="Ubicación inicial del delivery"
-          pinColor="red"
-        />
+        <Marker coordinate={deliveryLocation} title="Repartidor">
+          <FontAwesome5 name="motorcycle" size={26} color={Colors.primary} />
+        </Marker>
 
         {/* Mostrar la ubicación de la sucursal */}
-        <Marker
-          coordinate={branchLocation}
-          title="Sucursal de origen"
-          pinColor="blue"
-        />
+        <Marker coordinate={branchLocation} title="Sucursal de origen">
+          <MapPinIcon size={32} color={Colors.primary} />
+        </Marker>
 
         {/* Mostrar la ubicación del cliente */}
-        <Marker
-          coordinate={customerLocation}
-          title="Ubicación del cliente"
-          pinColor="green"
-        />
+        <Marker coordinate={customerLocation} title="Ubicación del cliente">
+          <UserIcon size={32} color={Colors.primary} />
+        </Marker>
 
         {/* Mostrar la ruta hacia la sucursal */}
         {routeToBranch.length > 0 && (

From 3089ae427c555c9b76c7f0857ebc36b65b33dd11 Mon Sep 17 00:00:00 2001
From: Andres Alvarez <andres15alvarez@gmail.com>
Date: Fri, 30 May 2025 06:11:46 -0400
Subject: [PATCH 291/291] Upgrade vesion 1.0.0

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index e85ed37..0fe1cfc 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "app",
-  "version": "0.2.0",
+  "version": "1.0.0",
   "main": "index.ts",
   "scripts": {
     "start": "expo start",