Merge pull request #127 from pubky/fix/import-flow

fix: import flow

Author: coreyphillips

android/app/build.gradle

@@ -82,8 +82,8 @@ android {
         applicationId "to.pubky.ring"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 8
-        versionName "1.3"
+        versionCode 9
+        versionName "1.4"
     }
 
     signingConfigs {

ios/pubkyring.xcodeproj/project.pbxproj

@@ -289,7 +289,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = pubkyring/Info.plist;
@@ -300,7 +300,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4;
+				MARKETING_VERSION = 0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",
@@ -320,7 +320,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 2;
+				CURRENT_PROJECT_VERSION = 1;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				INFOPLIST_FILE = pubkyring/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Pubky Ring";
@@ -330,7 +330,7 @@
 					"$(inherited)",
 					"@executable_path/Frameworks",
 				);
-				MARKETING_VERSION = 0.4;
+				MARKETING_VERSION = 0.5;
 				OTHER_LDFLAGS = (
 					"$(inherited)",
 					"-ObjC",

package.json

@@ -1,6 +1,6 @@
 {
   "name": "pubkyring",
-  "version": "0.0.18",
+  "version": "0.0.18-1",
   "private": false,
   "scripts": {
     "android": "react-native run-android",

src/components/EmptyState.tsx

@@ -1,13 +1,18 @@
 import React, { ReactElement, useCallback, useMemo } from 'react';
 import { StyleSheet } from 'react-native';
 import { View, Text, ArrowRight, Plus, Button, NavButton, CircleAlert } from '../theme/components.ts';
-import { createNewPubky } from '../utils/pubky.ts';
+import {
+	createNewPubky,
+	importPubky as importPubkyUtil,
+} from '../utils/pubky.ts';
 import { useDispatch } from 'react-redux';
 import PubkyRingHeader from './PubkyRingHeader';
 import { importFile } from '../utils/rnfs.ts';
 import { showEditPubkyPrompt, showToast } from '../utils/helpers.ts';
 import { SheetManager } from 'react-native-actions-sheet';
 import { useNavigation } from '@react-navigation/native';
+import { err, ok, Result } from '@synonymdev/result';
+import { IGenerateSecretKey, mnemonicPhraseToKeypair } from '@synonymdev/react-native-pubky';
 
 const EmptyState = (): ReactElement => {
 	const dispatch = useDispatch();
@@ -31,29 +36,62 @@ const EmptyState = (): ReactElement => {
 		}, 200);
 	}, [dispatch]);
 
-	const importPubky = useCallback(async () => {
-		const res = await importFile(dispatch);
-		if (res.isErr()) {
-			if (res.error?.message) {
+	const importPubky = useCallback(async (mnemonic = ''): Promise<Result<string>> => {
+		if (mnemonic) {
+			const secretKeyRes: Result<IGenerateSecretKey> = await mnemonicPhraseToKeypair(mnemonic);
+			if (secretKeyRes.isErr()) {
+				const msg = secretKeyRes.error.message;
+				showToast({
+					type: 'error',
+					title: 'Error',
+					description: msg,
+				});
+				return err(msg);
+			}
+
+			const secretKey: string = secretKeyRes.value.secret_key;
+			const pubky = await importPubkyUtil({ secretKey, dispatch, mnemonic });
+			if (pubky.isErr()) {
+				const msg = pubky.error.message;
 				showToast({
 					type: 'error',
 					title: 'Error',
-					description: res.error.message,
+					description: msg,
 				});
+				return err(msg);
 			}
-		} else {
+			await SheetManager.hide('add-pubky');
 			setTimeout( () => {
 				showEditPubkyPrompt({
 					title: 'Setup',
-					pubky: res.value,
+					pubky: pubky.value,
 				});
 			}, 200);
+			return ok('Successfully created pubky.');
+		}
+		const res = await importFile(dispatch);
+		if (res.isErr()) {
+			const msg = res.error?.message ?? 'Unable to import file.';
 			showToast({
-				type: 'success',
-				title: 'Success',
-				description: 'Pubky imported successfully',
+				type: 'error',
+				title: 'Error',
+				description: msg,
 			});
+			return err(msg);
 		}
+		setTimeout( () => {
+			showEditPubkyPrompt({
+				title: 'Setup',
+				pubky: res.value,
+			});
+		}, 200);
+		const msg = 'Pubky imported successfully';
+		showToast({
+			type: 'success',
+			title: 'Success',
+			description: msg,
+		});
+		return ok(msg);
 	}, [dispatch]);
 
 	const onPress = useCallback(() => {

src/screens/HomeScreen.tsx

@@ -297,8 +297,7 @@ const HomeScreen = (): ReactElement => {
 			}}
 			icon={<Plus size={16} />}
 		/>
-	// eslint-disable-next-line react-hooks/exhaustive-deps
-	), []);
+	), [createPubky, importPubky]);
 
 	const onFooterPress = useCallback( () => {
 		try {