Refactor & remove unnecessary hooks (keep-starknet-strange#98)

* Shim buffer & crypto * Keypair utils * Refactor & remove useLocalStorage hook * Refactor navigation store & create auth store * Use expo secure store instead of async storage
MSghais · May 24, 2024 · 22e4951 · 22e4951
1 parent d167f88
commit 22e4951
Show file tree

Hide file tree

Showing 16 changed files with 206 additions and 230 deletions.
diff --git a/JoyboyCommunity/app.json b/JoyboyCommunity/app.json
@@ -25,6 +25,9 @@
     },
     "web": {
       "favicon": "./assets/favicon.png"
-    }
+    },
+    "plugins": [
+      "expo-secure-store"
+    ]
   }
 }
diff --git a/JoyboyCommunity/index.js b/JoyboyCommunity/index.js
@@ -1,5 +1,8 @@
-import registerRootComponent from "expo/build/launch/registerRootComponent";
-import "fast-text-encoding";
-import { Wrapper } from "./src/app/Wrapper";
+import 'fast-text-encoding';
+import './src/app/Shims';
+
+import registerRootComponent from 'expo/build/launch/registerRootComponent';
+
+import {Wrapper} from './src/app/Wrapper';
 
 registerRootComponent(Wrapper);
diff --git a/JoyboyCommunity/package.json b/JoyboyCommunity/package.json
@@ -26,15 +26,18 @@
     "@react-navigation/native": "^6.1.17",
     "@react-navigation/native-stack": "^6.9.26",
     "@react-navigation/stack": "^6.3.29",
+    "buffer": "^6.0.3",
+    "crypto-es": "^2.1.0",
     "expo": "~51.0.8",
+    "expo-crypto": "~13.0.2",
+    "expo-secure-store": "~13.0.1",
     "expo-splash-screen": "~0.27.4",
     "expo-status-bar": "~1.12.1",
     "fast-text-encoding": "^1.0.6",
     "nostr-tools": "^2.5.2",
     "react": "18.2.0",
     "react-dom": "18.2.0",
     "react-native": "0.74.1",
-    "react-native-crypto-js": "1.0.0",
     "react-native-gesture-handler": "^2.16.2",
     "react-native-keychain": "^8.2.0",
     "react-native-pager-view": "6.3.0",

diff --git a/JoyboyCommunity/src/app/Router.tsx b/JoyboyCommunity/src/app/Router.tsx
@@ -5,7 +5,6 @@ import {createNativeStackNavigator} from '@react-navigation/native-stack';
 import {useMemo} from 'react';
 import {useTheme} from 'styled-components/native';
 
-import useNavigationStore from '../hooks/useNavigationContext';
 import Error from '../modules/error';
 import Feed from '../modules/feed';
 import Login from '../modules/login';
@@ -14,6 +13,7 @@ import CreatePost from '../modules/post';
 import Profile from '../modules/profile';
 import {NoteDetail} from '../screens/NoteDetail';
 import {UserDetail} from '../screens/UserDetail';
+import {useNavigationStore} from '../store/navigation';
 import {HomeStackParams, RootStackParams} from '../types';
 
 const RootStack = createNativeStackNavigator<RootStackParams>();

diff --git a/JoyboyCommunity/src/app/Shims.ts b/JoyboyCommunity/src/app/Shims.ts
@@ -0,0 +1,10 @@
+import {Buffer} from 'buffer/';
+import * as Crypto from 'expo-crypto';
+
+global.Buffer = Buffer as any;
+
+global.crypto = {
+  getRandomValues: (buffer: any) => Crypto.getRandomValues(buffer),
+  randomUUID: () => Crypto.randomUUID() as any,
+  getRandomBytes: (length: number) => Crypto.getRandomBytes(length),
+} as any;
diff --git a/JoyboyCommunity/src/hooks/useAuth.tsx b/JoyboyCommunity/src/hooks/useAuth.tsx
diff --git a/JoyboyCommunity/src/hooks/useLocalstorage.ts b/JoyboyCommunity/src/hooks/useLocalstorage.ts
diff --git a/JoyboyCommunity/src/hooks/useNostr.tsx b/JoyboyCommunity/src/hooks/useNostr.tsx
@@ -8,11 +8,10 @@ import {
   VerifiedEvent,
   verifyEvent,
 } from 'nostr-tools';
-import {generateSecretKey, getPublicKey} from 'nostr-tools';
 import {useMemo, useState} from 'react';
 
-import {uint8ArrayToHex} from '../utils/format';
 import {RELAYS_PROD} from '../utils/relay';
+
 export const useNostr = () => {
   const pool = new SimplePool();
   const relays = RELAYS_PROD;
@@ -28,34 +27,6 @@ export const useNostr = () => {
     return eventsData;
   }, [eventsData]);
 
-  const generateKeypair = () => {
-    try {
-      const sk = generateSecretKey();
-      const skString = uint8ArrayToHex(sk);
-      console.log('skString', skString);
-
-      const pk = getPublicKey(sk);
-      return {
-        pk,
-        sk,
-        skString,
-      };
-    } catch (e) {
-      console.log('Error generateKeypair', e);
-    }
-  };
-
-  const getPublicKeyByPk = (sk: Uint8Array) => {
-    try {
-      const pk = getPublicKey(sk);
-      return pk;
-    } catch (e) {
-      console.log('Error getPublicKeyByPk', e);
-
-      return undefined;
-    }
-  };
-
   const setEvents = (eventsData?: NostrEvent[]) => {
     setEventsData(eventsData);
   };
@@ -267,10 +238,8 @@ export const useNostr = () => {
     eventsData,
     parsingNip05EventContent,
     getUser,
-    generateKeypair,
     getEventsNotesFromPubkey,
     sendNote,
-    getPublicKeyByPk,
     getUserQuery,
     getEventsFromPubkey,
     getEventsByQuery,