Merge pull request #1099 from Bilb/fix-enter-create-private-group

ts/components/session/LeftPaneChannelSection.tsx

@@ -86,10 +86,7 @@ export class LeftPaneChannelSection extends React.Component<Props, State> {
     if (conversationList !== undefined) {
       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 && conversation.type === 'group'
       );
     }
 

ts/components/session/RegistrationTabs.tsx

@@ -901,6 +901,8 @@ export class RegistrationTabs extends React.Component<{}, State> {
       });
     } catch (e) {
       window.console.log(e);
+      await this.resetRegistration();
+
       this.setState({
         loading: false,
       });

ts/components/session/SessionClosableOverlay.tsx

@@ -173,10 +173,10 @@ export class SessionClosableOverlay extends React.Component<Props, State> {
               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)}
             />
           </div>
         ) : (