From 0ba20d45acd8fc2c44a04ee7b9066dcd72d4dca8 Mon Sep 17 00:00:00 2001 From: Mark Vujevits Date: Sat, 19 May 2018 15:41:12 +0200 Subject: [PATCH] sending name in qr code --- src/actions/Actions.ts | 3 +++ src/components/ContactList.tsx | 1 + src/containers/HomeScreenContainer.ts | 2 +- src/models/ContactData.ts | 1 + 4 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/actions/Actions.ts b/src/actions/Actions.ts index a1bc9eb..ad14a39 100644 --- a/src/actions/Actions.ts +++ b/src/actions/Actions.ts @@ -152,6 +152,9 @@ export const deleteContacts = (): DeleteContactsAction => ({ }); export const createUser = (name: string) => { + if (name == null) { + return; + } return async (dispatch, getState: () => AppState) => { const publicKey = await pssGetPublicKey(); const address = await pssGetBaseAddress(); diff --git a/src/components/ContactList.tsx b/src/components/ContactList.tsx index b4ff8d2..662799d 100644 --- a/src/components/ContactList.tsx +++ b/src/components/ContactList.tsx @@ -230,6 +230,7 @@ class ListHeader extends React.PureComponent { address: this.props.user.identity.address, timestamp: Date.now(), random: this.props.contactRandom, + name: this.props.user.name, }; return JSON.stringify(data); } diff --git a/src/containers/HomeScreenContainer.ts b/src/containers/HomeScreenContainer.ts index 2bdf971..fe9e484 100644 --- a/src/containers/HomeScreenContainer.ts +++ b/src/containers/HomeScreenContainer.ts @@ -27,7 +27,7 @@ const mapDispatchToProps = (dispatch): DispatchProps => { }, onCreateContact: (data: ContactData) => { if (isTimestampValid(data.timestamp)) { - dispatch(Actions.createContact(data.publicKey, data.address, '', 'invite-sent')); + dispatch(Actions.createContact(data.publicKey, data.address, data.name, 'invite-sent')); dispatch(Actions.sendInitiateContact(data.publicKey, data.address, data.timestamp, data.random)); } }, diff --git a/src/models/ContactData.ts b/src/models/ContactData.ts index 3e915bb..bbb9699 100644 --- a/src/models/ContactData.ts +++ b/src/models/ContactData.ts @@ -3,4 +3,5 @@ interface ContactData { address: string; timestamp: number; random: string; + name: string; }