From 081d4db2dd75e158e90a27480d0edc8057a17f93 Mon Sep 17 00:00:00 2001
From: gomes <17035424+gomesalexandre@users.noreply.github.com>
Date: Fri, 31 May 2024 00:21:25 +0200
Subject: [PATCH] feat: make types great again (ish, many ignores for sanity)

---
 package.json             |  5 +++--
 src/lib/crypto/crypto.ts |  3 +++
 tsconfig.json            |  3 ++-
 types/global.d.ts        |  2 ++
 yarn.lock                | 35 +++++++++++++++++++++++------------
 5 files changed, 33 insertions(+), 15 deletions(-)

diff --git a/package.json b/package.json
index 8b2eecd..cf1a0ef 100644
--- a/package.json
+++ b/package.json
@@ -32,7 +32,7 @@
     "react-native-get-random-values": "~1.11.0",
     "react-native-shake": "latest",
     "react-native-simple-crypto": "latest",
-    "react-native-svg": "15.2.0",
+    "react-native-svg": "15.3.0",
     "react-native-webview": "13.8.6",
     "react-singleton-hook": "^4.0.0"
   },
@@ -46,7 +46,8 @@
     "@types/jest": "^28.1.8",
     "@types/lodash.memoize": "^4.1.7",
     "@types/lodash.once": "^4.1.7",
-    "@types/react-native": "^0.70.4",
+    "@types/react": "^18.3.3",
+    "@types/react-native": "^0.73.0",
     "@types/react-test-renderer": "^18.0.0",
     "@typescript-eslint/eslint-plugin": "^5.38.1",
     "@typescript-eslint/parser": "^6.6.0",
diff --git a/src/lib/crypto/crypto.ts b/src/lib/crypto/crypto.ts
index 1af435b..ceab3f3 100644
--- a/src/lib/crypto/crypto.ts
+++ b/src/lib/crypto/crypto.ts
@@ -110,6 +110,9 @@ export async function makeKey(password: string, email: string): Promise<Symmetri
   const saltArray = Buffer.from(email, 'utf8')
   const passwordArray = Buffer.from(password, 'utf8')
   // The 'buffer' encoding is required to get the right value
+  // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+  // @ts-ignore this is crypto stuff, absolutely not touching/bumping things here despite the type error if this is happy at runtime
+  // meaning we can decrypt a locked native wallet
   const key = await scrypt(passwordArray, saltArray, 16384, 8, 1, 32, 'buffer')
 
   const hashKey = await pbkdf2(key, password, 'SHA256', 1)
diff --git a/tsconfig.json b/tsconfig.json
index 8928294..418b1c3 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -3,7 +3,8 @@
   "extends": "@tsconfig/react-native/tsconfig.json",     /* Recommended React Native TSConfig base */
   "compilerOptions": {
     "jsx": "react",
-    "lib": ["es2020"]
+    "lib": ["es2020"],
+    "skipLibCheck": true // lib checks borked out of sanity after latest bumps - not an issue at runtime
     /* Visit https://aka.ms/tsconfig.json to read more about this file */
   }
 }
diff --git a/types/global.d.ts b/types/global.d.ts
index 551bf4e..9bc8b26 100644
--- a/types/global.d.ts
+++ b/types/global.d.ts
@@ -1,6 +1,8 @@
 import { Buffer as B } from '@craftzdog/react-native-buffer'
 
 declare global {
+  // @ts-ignore
   type Buffer = typeof Buffer
+  // @ts-ignore
   const Buffer: B
 }
diff --git a/yarn.lock b/yarn.lock
index 0ce81dc..5506d7d 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -4261,12 +4261,12 @@ __metadata:
   languageName: node
   linkType: hard
 
-"@types/react-native@npm:^0.70.4":
-  version: 0.70.4
-  resolution: "@types/react-native@npm:0.70.4"
+"@types/react-native@npm:^0.73.0":
+  version: 0.73.0
+  resolution: "@types/react-native@npm:0.73.0"
   dependencies:
-    "@types/react": "*"
-  checksum: b75c2322b6bbd9b5b599af76c6d53596f91dda1b4a3311c169043459e9be925d1438a3ff591d4064cec33a1990193cc48cc0bac33dfb07756fb5bbcc269987cc
+    react-native: "*"
+  checksum: a764ca5d876dae3c109da449f736c44271b3b236d0d6e836c078247af1419f6d851600c56bb0c26f3e0d1b4be6eaac56b65c1f74ad0f0d05baf8b65dd1d5c597
   languageName: node
   linkType: hard
 
@@ -4290,6 +4290,16 @@ __metadata:
   languageName: node
   linkType: hard
 
+"@types/react@npm:^18.3.3":
+  version: 18.3.3
+  resolution: "@types/react@npm:18.3.3"
+  dependencies:
+    "@types/prop-types": "*"
+    csstype: ^3.0.2
+  checksum: c63d6a78163244e2022b01ef79b0baec4fe4da3475dc4a90bb8accefad35ef0c43560fd0312e5974f92a0f1108aa4d669ac72d73d66396aa060ea03b5d2e3873
+  languageName: node
+  linkType: hard
+
 "@types/scheduler@npm:*":
   version: 0.16.2
   resolution: "@types/scheduler@npm:0.16.2"
@@ -11261,16 +11271,16 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native-svg@npm:15.2.0":
-  version: 15.2.0
-  resolution: "react-native-svg@npm:15.2.0"
+"react-native-svg@npm:15.3.0":
+  version: 15.3.0
+  resolution: "react-native-svg@npm:15.3.0"
   dependencies:
     css-select: ^5.1.0
     css-tree: ^1.1.3
   peerDependencies:
     react: "*"
     react-native: "*"
-  checksum: 0075d3c5bcf6bbbebe064364ec72c02eeff3fc0f2b1ba127bde26a8ecedc190a7890a910a6a051687318fa80504a3bc335eee2bfd6846b90193ca1608bae821e
+  checksum: e976878361c100639ab4f9bd2cd042f526b28890cc0052139b36a5ebde44cd3b1a54c6dd3b5e391fe10a998767a994748fc6ee3f1b356154418828d12f98d77a
   languageName: node
   linkType: hard
 
@@ -11287,7 +11297,7 @@ __metadata:
   languageName: node
   linkType: hard
 
-"react-native@npm:0.74.1":
+"react-native@npm:*, react-native@npm:0.74.1":
   version: 0.74.1
   resolution: "react-native@npm:0.74.1"
   dependencies:
@@ -12074,7 +12084,8 @@ __metadata:
     "@types/jest": ^28.1.8
     "@types/lodash.memoize": ^4.1.7
     "@types/lodash.once": ^4.1.7
-    "@types/react-native": ^0.70.4
+    "@types/react": ^18.3.3
+    "@types/react-native": ^0.73.0
     "@types/react-test-renderer": ^18.0.0
     "@typescript-eslint/eslint-plugin": ^5.38.1
     "@typescript-eslint/parser": ^6.6.0
@@ -12103,7 +12114,7 @@ __metadata:
     react-native-get-random-values: ~1.11.0
     react-native-shake: latest
     react-native-simple-crypto: latest
-    react-native-svg: 15.2.0
+    react-native-svg: 15.3.0
     react-native-webview: 13.8.6
     react-singleton-hook: ^4.0.0
     react-test-renderer: 18.2.0