Update header template to display group names properly and update migration to only store name for public chat

pull/388/head
Beaudan 6 years ago
parent 1d0067e6e5
commit 1fc2173d9b

@ -790,10 +790,8 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
sessionResetStatus: 0, sessionResetStatus: 0,
swarmNodes: [], swarmNodes: [],
type: 'group', type: 'group',
profile: {
displayName: 'Loki Public Chat',
},
server: 'https://chat.lokinet.org', server: 'https://chat.lokinet.org',
name: 'Loki Public Chat',
channelId: '1', channelId: '1',
unlockTimestamp: null, unlockTimestamp: null,
unreadCount: 0, unreadCount: 0,
@ -801,7 +799,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
version: 2, version: 2,
}; };
const { id, type, name, friendRequestStatus, profileName } = publicChatData; const { id, type, name, friendRequestStatus } = publicChatData;
await instance.run( await instance.run(
`INSERT INTO conversations ( `INSERT INTO conversations (
@ -811,8 +809,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
type, type,
members, members,
name, name,
friendRequestStatus, friendRequestStatus
profileName
) values ( ) values (
$id, $id,
$json, $json,
@ -820,8 +817,7 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
$type, $type,
$members, $members,
$name, $name,
$friendRequestStatus, $friendRequestStatus
$profileName
);`, );`,
{ {
$id: id, $id: id,
@ -831,7 +827,6 @@ async function updateToLokiSchemaVersion1(currentVersion, instance) {
$members: null, $members: null,
$name: name, $name: name,
$friendRequestStatus: friendRequestStatus, $friendRequestStatus: friendRequestStatus,
$profileName: profileName,
} }
); );

@ -96,7 +96,7 @@ export class ConversationHeader extends React.Component<Props> {
} }
public renderTitle() { public renderTitle() {
const { phoneNumber, i18n, profileName, isKeysPending, isMe } = this.props; const { phoneNumber, i18n, profileName, isKeysPending, isMe, name } = this.props;
if (isMe) { if (isMe) {
return ( return (
@ -111,6 +111,7 @@ export class ConversationHeader extends React.Component<Props> {
<ContactName <ContactName
phoneNumber={phoneNumber} phoneNumber={phoneNumber}
profileName={profileName} profileName={profileName}
name={name}
i18n={i18n} i18n={i18n}
/> />
{isKeysPending ? '(pending)' : null} {isKeysPending ? '(pending)' : null}

Loading…
Cancel
Save