fix: error response

- Adds error response to importPubky
- Ensures the mnemonic form no longer closes on error
- Updates isNewFormat check
- Adds totast message to MnemonicForm.tsx.

Author: coreyphillips

android/app/build.gradle

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

ios/pubkyring.xcodeproj/project.pbxproj

@@ -289,7 +289,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = pubkyring/Info.plist;
@@ -320,7 +320,7 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
-				CURRENT_PROJECT_VERSION = 1;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = KYH47R284B;
 				INFOPLIST_FILE = pubkyring/Info.plist;
 				INFOPLIST_KEY_CFBundleDisplayName = "Pubky Ring";

src/components/AddPubky.tsx

@@ -6,6 +6,7 @@ import React, {
 	useState,
 } from 'react';
 import {
+	Dimensions,
 	Image,
 	Platform,
 	StyleSheet,
@@ -27,13 +28,25 @@ import ModalIndicator from './ModalIndicator.tsx';
 import MnemonicForm from './MnemonicForm.tsx';
 import { AUTHORIZE_KEY_GRADIENT } from '../utils/constants.ts';
 import absoluteFillObject = StyleSheet.absoluteFillObject;
+import { Result } from '@synonymdev/result';
+import { toastConfig } from '../theme/toastConfig.tsx';
+import Toast from 'react-native-toast-message';
 
 const ACTION_SHEET_HEIGHT = Platform.OS === 'ios' ? '95%' : '100%';
+const { height } = Dimensions.get('window');
+const isSmallScreen = height < 700;
+const toastStyle = {
+	top: Platform.select({
+		ios: isSmallScreen ? -9 : -50,
+		android: isSmallScreen ? -9 : -50,
+	}),
+};
+
 
 const AddPubky = ({ payload }: {
 	payload: {
 		createPubky: () => void;
-		importPubky: (mnemonic?: string) => Promise<void>;
+		importPubky: (mnemonic?: string) => Promise<Result<string>>;
 	};
 }): ReactElement => {
 	const navigationAnimation = useSelector(getNavigationAnimation);
@@ -70,11 +83,6 @@ const AddPubky = ({ payload }: {
 		setCurrentScreen('import-options');
 	}, []);
 
-	const onMnemonicImport = useCallback(async (mnemonicPhrase: string) => {
-		await importPubky(mnemonicPhrase);
-		closeSheet();
-	}, [closeSheet, importPubky]);
-
 	const onMnemonicBack = useCallback(() => {
 		setCurrentScreen('import-options');
 	}, []);
@@ -183,7 +191,7 @@ const AddPubky = ({ payload }: {
 				<MnemonicForm
 					onBack={onMnemonicBack}
 					onCancel={onMnemonicCancel}
-					onImport={onMnemonicImport}
+					onImport={importPubky}
 				/>
 			);
 		}
@@ -215,7 +223,7 @@ const AddPubky = ({ payload }: {
 				</View>
 			</>
 		);
-	}, [currentScreen, getButtonConfig, getHeaderText, getImage, messageText, onMnemonicBack, onMnemonicCancel, onMnemonicImport, renderBackButton, shouldShowBackButton, titleText]);
+	}, [currentScreen, getButtonConfig, getHeaderText, getImage, importPubky, messageText, onMnemonicBack, onMnemonicCancel, renderBackButton, shouldShowBackButton, titleText]);
 
 	return (
 		<View style={styles.container}>
@@ -235,6 +243,7 @@ const AddPubky = ({ payload }: {
 				>
 					{getContent()}
 				</RadialGradient>
+				<Toast config={toastConfig({ style: toastStyle })} />
 			</ActionSheetContainer>
 		</View>
 	);

src/components/MnemonicForm.tsx

@@ -27,11 +27,12 @@ import {
 import { ScrollView } from 'react-native';
 import Button from '../components/Button.tsx';
 import ModalIndicator from './ModalIndicator.tsx';
+import { Result } from '@synonymdev/result';
 
 interface MnemonicFormProps {
 	onBack: () => void;
 	onCancel: () => void;
-	onImport: (mnemonicPhrase: string) => void;
+	onImport: (mnemonicPhrase: string) => Promise<Result<string>>
 }
 
 const MnemonicForm = ({ onBack, onCancel, onImport }: MnemonicFormProps): ReactElement => {

src/screens/HomeScreen.tsx

@@ -44,7 +44,7 @@ import PubkyRingLogo from '../images/pubky-ring.png';
 // @ts-ignore
 import DeviceMobileLogo from '../images/device-mobile.png';
 import { PUBKY_APP_URL } from '../utils/constants.ts';
-import { Result } from '@synonymdev/result';
+import { err, ok, Result } from '@synonymdev/result';
 import { mnemonicPhraseToKeypair, IGenerateSecretKey } from '@synonymdev/react-native-pubky';
 
 type NavigationProp = NativeStackNavigationProp<RootStackParamList, 'Home'>;
@@ -103,58 +103,62 @@ const HomeScreen = (): ReactElement => {
 		}, 200);
 	}, [dispatch]);
 
-	const importPubky = useCallback(async (mnemonic = ''): Promise<void> => {
+	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: 'An error occurred while creating the Pubky',
+					description: msg,
 				});
-				return;
+				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: pubky.error.message,
+					description: msg,
 				});
-				return;
+				return err(msg);
 			}
+			await SheetManager.hide('add-pubky');
 			setTimeout( () => {
 				showEditPubkyPrompt({
 					title: 'Setup',
 					pubky: pubky.value,
 				});
 			}, 200);
-			return;
+			return ok('Successfully created pubky.');
 		}
 		const res = await importFile(dispatch);
 		if (res.isErr()) {
-			if (res.error?.message) {
-				showToast({
-					type: 'error',
-					title: 'Error',
-					description: res.error.message,
-				});
-			}
-		} else {
-			setTimeout( () => {
-				showEditPubkyPrompt({
-					title: 'Setup',
-					pubky: res.value,
-				});
-			}, 200);
+			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 _handleDeepLink = useCallback(async () => {

src/utils/pubky.ts

@@ -272,9 +272,7 @@ export const savePubky = async ({
 const isNewFormat = (value: string): boolean => {
 	try {
 		const parsed = JSON.parse(value);
-		return typeof parsed === 'object' &&
-			'secretKey' in parsed &&
-			typeof parsed.secretKey === 'string';
+		return 'secretKey' in parsed && 'mnemonic' in parsed;
 	} catch {
 		return false;
 	}