From caace04c3231eabdcdca57081dae153abce43e46 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 24 Apr 2020 13:09:03 +1000 Subject: [PATCH 1/4] fix enter press to create a closed group --- ts/components/session/SessionClosableOverlay.tsx | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ts/components/session/SessionClosableOverlay.tsx b/ts/components/session/SessionClosableOverlay.tsx index c67e87577..6a8b34a77 100644 --- a/ts/components/session/SessionClosableOverlay.tsx +++ b/ts/components/session/SessionClosableOverlay.tsx @@ -173,10 +173,10 @@ export class SessionClosableOverlay extends React.Component { ref={this.inputRef} editable={!noContactsForClosedGroup} placeholder={placeholder} - value={this.state.groupName} + value={groupName} maxLength={window.CONSTANTS.MAX_GROUPNAME_LENGTH} onChange={this.onGroupNameChanged} - onPressEnter={() => onButtonClick(this.state.groupName)} + onPressEnter={() => onButtonClick(groupName, selectedMembers)} /> ) : ( From 2a9a2f7fb9a9ad0d99104e6a9a45c4fcb03539e9 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 24 Apr 2020 14:03:21 +1000 Subject: [PATCH 2/4] show closed group in channels list --- ts/components/session/LeftPaneChannelSection.tsx | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ts/components/session/LeftPaneChannelSection.tsx b/ts/components/session/LeftPaneChannelSection.tsx index fd543ebef..2eaf2c9b6 100644 --- a/ts/components/session/LeftPaneChannelSection.tsx +++ b/ts/components/session/LeftPaneChannelSection.tsx @@ -87,9 +87,7 @@ export class LeftPaneChannelSection extends React.Component { conversationList = conversationList.filter( // a channel is either a public group or a rss group conversation => - conversation.type === 'group' && - (conversation.isPublic || - (conversation.lastMessage && conversation.lastMessage.isRss)) + conversation && conversation.type === 'group' ); } From 73bc9e1204786519906c7fdbddb23b8097635396 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Fri, 24 Apr 2020 15:23:18 +1000 Subject: [PATCH 3/4] reset registration on excepion got --- ts/components/session/RegistrationTabs.tsx | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ts/components/session/RegistrationTabs.tsx b/ts/components/session/RegistrationTabs.tsx index a7fb044db..1e10d8ee0 100644 --- a/ts/components/session/RegistrationTabs.tsx +++ b/ts/components/session/RegistrationTabs.tsx @@ -902,6 +902,8 @@ export class RegistrationTabs extends React.Component<{}, State> { }); } catch (e) { window.console.log(e); + await this.resetRegistration(); + this.setState({ loading: false, }); From 14ba0aeb65b4ca17fc1fe285fe6b3aa828c27a37 Mon Sep 17 00:00:00 2001 From: Audric Ackermann Date: Mon, 27 Apr 2020 10:09:39 +1000 Subject: [PATCH 4/4] fix lint --- ts/components/session/LeftPaneChannelSection.tsx | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/ts/components/session/LeftPaneChannelSection.tsx b/ts/components/session/LeftPaneChannelSection.tsx index 2eaf2c9b6..0ae41254b 100644 --- a/ts/components/session/LeftPaneChannelSection.tsx +++ b/ts/components/session/LeftPaneChannelSection.tsx @@ -86,8 +86,7 @@ export class LeftPaneChannelSection extends React.Component { if (conversationList !== undefined) { conversationList = conversationList.filter( // a channel is either a public group or a rss group - conversation => - conversation && conversation.type === 'group' + conversation => conversation && conversation.type === 'group' ); }