Merge pull request #2376 from shubhamkmr04/shubham/contactstore-on-se…

…nd-view Send: Using ContactStore to fetch contacts
ZeusLN · Aug 30, 2024 · 6ec8818 · 6ec8818
2 parents 493eab0 + 5708ce8
commit 6ec8818
Showing 1 changed file with 12 additions and 28 deletions.
diff --git a/views/Send.tsx b/views/Send.tsx
@@ -14,7 +14,6 @@ import {
     NativeEventSubscription
 } from 'react-native';
 import { Chip, Icon } from 'react-native-elements';
-import EncryptedStorage from 'react-native-encrypted-storage';
 import Clipboard from '@react-native-clipboard/clipboard';
 import { inject, observer } from 'mobx-react';
 import NfcManager, {
@@ -34,6 +33,7 @@ import NodeInfoStore from '../stores/NodeInfoStore';
 import SettingsStore from '../stores/SettingsStore';
 import TransactionsStore from '../stores/TransactionsStore';
 import UTXOsStore from '../stores/UTXOsStore';
+import ContactStore from '../stores/ContactStore';
 
 import Amount from '../components/Amount';
 import AmountInput from '../components/AmountInput';
@@ -75,6 +75,7 @@ interface SendProps {
     TransactionsStore: TransactionsStore;
     SettingsStore: SettingsStore;
     UTXOsStore: UTXOsStore;
+    ContactStore: ContactStore;
     route: Route<
         'Send',
         {
@@ -110,7 +111,6 @@ interface SendState {
     clipboard: string;
     loading: boolean;
     contactName: string;
-    contacts: Contact[];
     clearOnBackPress: boolean;
     account: string;
     additionalOutputs: Array<AdditionalOutput>;
@@ -123,7 +123,8 @@ interface SendState {
     'TransactionsStore',
     'BalanceStore',
     'SettingsStore',
-    'UTXOsStore'
+    'UTXOsStore',
+    'ContactStore'
 )
 @observer
 export default class Send extends React.Component<SendProps, SendState> {
@@ -168,7 +169,6 @@ export default class Send extends React.Component<SendProps, SendState> {
             clipboard: '',
             loading: false,
             contactName,
-            contacts: [],
             clearOnBackPress,
             account: 'default',
             additionalOutputs: []
@@ -221,8 +221,6 @@ export default class Send extends React.Component<SendProps, SendState> {
             this.validateAddress(this.state.destination);
         }
 
-        this.loadContacts();
-
         this.backPressSubscription = BackHandler.addEventListener(
             'hardwareBackPress',
             this.backPressed.bind(this)
@@ -233,25 +231,6 @@ export default class Send extends React.Component<SendProps, SendState> {
         this.backPressSubscription?.remove();
     }
 
-    loadContacts = async () => {
-        this.props.navigation.addListener('focus', async () => {
-            try {
-                const contactsString = await EncryptedStorage.getItem(
-                    'zeus-contacts'
-                );
-                if (contactsString) {
-                    const contacts: Contact[] = JSON.parse(contactsString);
-                    this.setState({ contacts, loading: false });
-                } else {
-                    this.setState({ loading: false });
-                }
-            } catch (error) {
-                console.error('Error loading contacts:', error);
-                this.setState({ loading: false });
-            }
-        });
-    };
-
     subscribePayment = (streamingCall: string) => {
         const { handlePayment, handlePaymentError } =
             this.props.TransactionsStore;
@@ -667,8 +646,13 @@ export default class Send extends React.Component<SendProps, SendState> {
     };
 
     render() {
-        const { SettingsStore, BalanceStore, UTXOsStore, navigation } =
-            this.props;
+        const {
+            SettingsStore,
+            BalanceStore,
+            UTXOsStore,
+            ContactStore,
+            navigation
+        } = this.props;
         const {
             isValid,
             transactionType,
@@ -686,7 +670,6 @@ export default class Send extends React.Component<SendProps, SendState> {
             clipboard,
             loading,
             contactName,
-            contacts,
             additionalOutputs
         } = this.state;
         const {
@@ -695,6 +678,7 @@ export default class Send extends React.Component<SendProps, SendState> {
             lightningBalance
         } = BalanceStore;
         const { implementation } = SettingsStore;
+        const { contacts } = ContactStore;
 
         const paymentOptions = [localeString('views.Send.lnPayment')];