From b953f513c61545a306711a2a784a377d64560156 Mon Sep 17 00:00:00 2001
From: minibits-cash <support@minibits.cash>
Date: Fri, 2 Feb 2024 15:49:04 +0100
Subject: [PATCH] Fix own Nostr address, move it to Privacy settings

---
 package.json                     |  2 +-
 src/models/ContactsStore.ts      |  1 +
 src/navigation/TabsNavigator.tsx |  6 ++-
 src/screens/OwnKeysScreen.tsx    | 23 +++++----
 src/screens/PrivacyScreen.tsx    | 81 ++++++++++++++++++++++++++++++--
 src/screens/ProfileScreen.tsx    | 52 +++++++++++---------
 6 files changed, 130 insertions(+), 35 deletions(-)

diff --git a/package.json b/package.json
index d4e177b..bad942b 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "minibits_wallet",
-  "version": "0.1.5-beta.31",
+  "version": "0.1.5-beta.32",
   "private": true,
   "scripts": {
     "android:clean": "cd android && ./gradlew clean",
diff --git a/src/models/ContactsStore.ts b/src/models/ContactsStore.ts
index cf407cd..7e5ac4b 100644
--- a/src/models/ContactsStore.ts
+++ b/src/models/ContactsStore.ts
@@ -108,6 +108,7 @@ import {
                 }
                 
                 const ts2: number = Math.floor(Date.now() / 1000)
+                self.lastPendingReceivedCheck = ts2
                 log.trace('[setLastPendingReceivedCheck]', {ts2})                
             },
             addReceivedEventId(id: string) {            
diff --git a/src/navigation/TabsNavigator.tsx b/src/navigation/TabsNavigator.tsx
index 74b32b2..dbb68dc 100644
--- a/src/navigation/TabsNavigator.tsx
+++ b/src/navigation/TabsNavigator.tsx
@@ -173,7 +173,8 @@ export type ContactsStackParamList = {
     OwnName: {navigation: any}
     ContactDetail: {contact: Contact, relays: string[]}
     OwnKeys: undefined
-    WalletNavigator: {screen: string, params: any}    
+    WalletNavigator: {screen: string, params: any}
+    SettingsNavigator: {screen: string}    
 }  
   
 export type ContactsStackScreenProps<T extends keyof ContactsStackParamList> = StackScreenProps<
@@ -219,7 +220,8 @@ export type SettingsStackParamList = {
   LocalRecovery: undefined
   Developer: undefined
   Relays: undefined
-  WalletNavigator: {screen: string}  
+  WalletNavigator: {screen: string} 
+  ContactsNavigator: {screen: string}  
 }
 
 export type SettingsStackScreenProps<T extends keyof SettingsStackParamList> = StackScreenProps<
diff --git a/src/screens/OwnKeysScreen.tsx b/src/screens/OwnKeysScreen.tsx
index 70b7518..508f286 100644
--- a/src/screens/OwnKeysScreen.tsx
+++ b/src/screens/OwnKeysScreen.tsx
@@ -215,7 +215,7 @@ export const OwnKeysScreen: FC<OwnKeysScreenProps> = observer(function OwnKeysSc
                 ContentComponent={
                     <>
                     {!ownProfile ? (
-                        <View style={$nip05Container}>                      
+                        <View style={$nip05Container}>                    
                             <ListItem
                                 LeftComponent={<View style={[$numIcon, {backgroundColor: iconNip05}]}><Text text='1'/></View>}
                                 text='Enter your NOSTR address'
@@ -335,13 +335,20 @@ export const OwnKeysScreen: FC<OwnKeysScreenProps> = observer(function OwnKeysSc
                 <Card
                     style={[$card, {marginTop: spacing.medium}]}
                     ContentComponent={
-                    <ListItem
-                        leftIcon='faCheckCircle'
-                        leftIconColor={colors.palette.success200}
-                        text='Profile change is ready'
-                        subText='Wallet needs to restart to apply this change.'                      
-                        style={{}}
-                    />
+                    <>
+                        <ListItem
+                            leftIcon='faTriangleExclamation'
+                            text='Consider before change'
+                            subText={'Using your own Nostr address will disable Lightning address features unique to minibits.cash address.'}                        
+                        />
+                        <ListItem
+                            leftIcon='faCheckCircle'
+                            leftIconColor={colors.palette.success200}
+                            text='Profile change is ready'
+                            subText='Wallet needs to restart to apply this change.'                      
+                            style={{}}
+                        />
+                    </>
                     }
                     />
                     <View style={$buttonContainer}>
diff --git a/src/screens/PrivacyScreen.tsx b/src/screens/PrivacyScreen.tsx
index 5d748f1..d17f758 100644
--- a/src/screens/PrivacyScreen.tsx
+++ b/src/screens/PrivacyScreen.tsx
@@ -19,8 +19,10 @@ import {useHeader} from '../utils/useHeader'
 import {useStores} from '../models'
 import AppError from '../utils/AppError'
 import {ResultModalInfo} from './Wallet/ResultModalInfo'
-import { TorDaemon } from '../services'
+import { KeyChain, MinibitsClient, TorDaemon } from '../services'
 import { log } from '../services/logService'
+import { OwnKeysScreen } from './OwnKeysScreen'
+import { MINIBITS_NIP05_DOMAIN } from '@env'
 
 enum TorStatus {
     NOTINIT = 'NOTINIT',
@@ -35,7 +37,7 @@ export const PrivacyScreen: FC<SettingsStackScreenProps<'Privacy'>> = observer(f
         onLeftPress: () => navigation.goBack(),
     })
 
-    const {userSettingsStore} = useStores()
+    const {userSettingsStore, walletProfileStore} = useStores()
     const [info, setInfo] = useState('')
     const [isLoading, setIsLoading] = useState(false)
     const [isTorDaemonOn, setIsTorDaemonOn] = useState<boolean>(
@@ -159,6 +161,41 @@ export const PrivacyScreen: FC<SettingsStackScreenProps<'Privacy'>> = observer(f
         }
     }
 
+    const gotoOwnKeys = function() {        
+        navigation.navigate('ContactsNavigator', {screen: 'OwnKeys'})
+    }
+
+    const resetProfile = async function() {
+        setIsLoading(true)        
+
+        try {
+            // overwrite with new keys
+            const keyPair = KeyChain.generateNostrKeyPair()
+            await KeyChain.saveNostrKeyPair(keyPair)
+
+            // set name to defualt walletId
+            const name = userSettingsStore.walletId as string
+
+            // get random image
+            const pictures = await MinibitsClient.getRandomPictures() // TODO PERF
+
+            // update wallet profile
+            await walletProfileStore.updateNip05(
+                keyPair.publicKey,
+                name + MINIBITS_NIP05_DOMAIN,
+                name,
+                pictures[0],
+                false // isOwnProfile
+            )
+
+
+            navigation.navigate('ContactsNavigator', {screen: 'Profile'})
+            setIsLoading(false)
+        } catch (e: any) {
+            handleError(e)
+        }
+    }
+
     const handleError = function (e: AppError): void {
         setIsLoading(false)
         setError(e)
@@ -168,7 +205,7 @@ export const PrivacyScreen: FC<SettingsStackScreenProps<'Privacy'>> = observer(f
     const iconColor = useThemeColor('textDim')
 
     return (
-      <Screen style={$screen}>
+      <Screen style={$screen} preset='auto'>
         <View style={[$headerContainer, {backgroundColor: headerBg}]}>
           <Text preset="heading" text="Privacy" style={{color: 'white'}} />
         </View>
@@ -245,6 +282,44 @@ export const PrivacyScreen: FC<SettingsStackScreenProps<'Privacy'>> = observer(f
                 </>
                 }
             />
+            <Card
+                style={[$card, {marginTop: spacing.medium}]}
+                ContentComponent={
+                <>                    
+                    <ListItem
+                        text="Use own Nostr profile"
+                        subText={walletProfileStore.isOwnProfile ? walletProfileStore.nip05 : "Import your own NOSTR address and keys. Your wallet stops communicate with minibits.cash Nostr and Lnurl address servers. However this will disable Lightning address features to receive zaps and payments. Only for hard core ecash-ers!"}
+                        leftIcon={'faShareNodes'}
+                        leftIconColor={
+                            walletProfileStore.isOwnProfile
+                            ? colors.palette.iconViolet200
+                            : iconColor as string
+                        }
+                        leftIconInverse={true}
+                        RightComponent={                                   
+                            <>
+                            {walletProfileStore.isOwnProfile ? (
+                                <Button
+                                    style={{maxHeight: 10, marginTop: spacing.medium}}
+                                    preset="secondary"
+                                    text="Reset"
+                                    onPress={resetProfile}
+                                />
+                            ) : (
+                                <Button
+                                    style={{maxHeight: 10, marginTop: spacing.medium}}
+                                    preset="secondary"
+                                    text="Import"
+                                    onPress={gotoOwnKeys}
+                                />
+                            )}
+                            </>                        
+                        }
+                        style={$item}
+                    />
+                </>
+                }
+            />
             <Card
                 style={[$card, {marginTop: spacing.medium}]}
                 ContentComponent={
diff --git a/src/screens/ProfileScreen.tsx b/src/screens/ProfileScreen.tsx
index 9591d30..da02b8a 100644
--- a/src/screens/ProfileScreen.tsx
+++ b/src/screens/ProfileScreen.tsx
@@ -79,6 +79,12 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
     }
 
 
+    const gotoPrivacy = function() {
+        toggleUpdateModal()
+        navigation.navigate('SettingsNavigator', {screen: 'Privacy'})
+    }
+
+
     const gotoOwnKeys = function() {
         toggleUpdateModal()
         navigation.navigate('OwnKeys')
@@ -123,8 +129,9 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
     }
 
     
-    const resetProfile = async function() {
+    /* const resetProfile = async function() {
         setIsLoading(true)
+        toggleUpdateModal()
 
         try {
             // overwrite with new keys
@@ -150,7 +157,7 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
         } catch (e: any) {
             handleError(e)
         }
-    }
+    }*/
 
     const handleError = function (e: AppError): void {
         setIsLoading(false)      
@@ -174,7 +181,7 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
                             <>
                             <ListItem 
                                 text='Create wallet address'
-                                subText='Your wallet address allows you to receive encrypted ecash over Nostr. At the same time it serves as your Lightning address, so that you can receive payments from any Lightning wallet or zaps on Nostr social network.'
+                                subText='Your minibits.cash wallet address allows you to receive encrypted ecash over Nostr. At the same time it serves as your Lightning address, so that you can receive payments from any Lightning wallet or zaps on Nostr social network.'
                             />
                             <View style={$buttonContainer}> 
                                 <Button
@@ -187,13 +194,23 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
                             </>
                         ) : (
                             <>
-                                <ListItem
-                                    text='Your Minibits wallet address'
-                                    subText={`Share your wallet address to receive encrypted ecash over Nostr. At the same time it serves as your Lightning address, so that you can receive payments from any Lightning wallet or zaps on Nostr social network.`}
-                                    leftIcon='faCircleUser'
-                                    bottomSeparator={true}
-                                    style={{paddingRight: spacing.small}}
-                                />
+                                {walletProfileStore.isOwnProfile ? (
+                                    <ListItem
+                                        text='Your own wallet address'
+                                        subText={`You are using your own Nostr address to send and receive ecash. Please note, that such setup does not allow to receive Nostr zaps nor Lightning payments to this address.`}
+                                        leftIcon='faCircleUser'
+                                        bottomSeparator={true}
+                                        style={{paddingRight: spacing.small}}
+                                    />
+                                ) : (
+                                    <ListItem
+                                        text='Your Minibits wallet address'
+                                        subText={`Share your wallet address to receive encrypted ecash over Nostr. At the same time it serves as your Lightning address, so that you can receive payments from any Lightning wallet or zaps on Nostr social network.`}
+                                        leftIcon='faCircleUser'
+                                        bottomSeparator={true}
+                                        style={{paddingRight: spacing.small}}
+                                    />   
+                                )}
                                 <View style={$buttonContainer}>                            
                                     <Button
                                         preset='secondary'                                
@@ -226,7 +243,7 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
                                 gotoWalletName={gotoWalletName}
                             />
                         )}
-                        {walletProfileStore.isOwnProfile ? (
+                        {walletProfileStore.isOwnProfile && (
                             <>
                             <ListItem
                                 text='Sync own profile'
@@ -237,18 +254,11 @@ export const ProfileScreen: FC<ProfileScreenProps> = observer(
                             />
                             <ListItem
                                 text='Reset own profile'
-                                subText='Stop using your own NOSTR address and re-create Minibits wallet profile with random NOSTR address.'
+                                subText='Stop using your own NOSTR address and re-create Minibits wallet profile.'
                                 leftIcon='faXmark'
-                                onPress={resetProfile}
+                                onPress={gotoPrivacy}
                             />
                             </>
-                        ) : (
-                            <ListItem
-                                text='Use own Nostr profile'
-                                subText='Use existing NOSTR address as your wallet address. You can then use Minibits to send and receive ecash using your public identity on NOSTR social network.'
-                                leftIcon='faKey'          
-                                onPress={gotoOwnKeys}
-                            />
                         )} 
                     </>
                 }
@@ -304,7 +314,7 @@ return (
             subTx='profileScreen.changeWalletaddressSubtext'
             leftIcon='faPencil'
             onPress={props.gotoWalletName}
-            bottomSeparator={true}            
+            // bottomSeparator={true}            
         />
     </>
 )