Skip to content
This repository has been archived by the owner on Mar 13, 2024. It is now read-only.

Commit

Permalink
MM-13474 - Updating new channel modal (#2219)
Browse files Browse the repository at this point in the history
* MM-13474 - Updating new channel modal

* Updating tests
  • Loading branch information
asaadmahmood authored and cpanato committed Dec 19, 2018
1 parent c4b1ba1 commit 1f08516
Show file tree
Hide file tree
Showing 2 changed files with 43 additions and 33 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,28 @@ exports[`components/NewChannelModal should match snapshot, display only private
className="col-sm-9"
>
<div
className="type-container"
className="type-container multi-select__radio"
>
<div
className="flex-parent"
className="radio"
>
<LockIcon
className="icon icon__lock icon--body type-icon"
/>
<FormattedMessage
defaultMessage="Private"
id="channel_modal.privateName"
values={Object {}}
/>
<FormattedMessage
defaultMessage=" - Only invited members can join this channel."
id="channel_modal.privateHint"
values={Object {}}
/>
<div
className="flex-parent"
>
<LockIcon
className="icon icon__lock icon--body type-icon"
/>
<FormattedMessage
defaultMessage="Private"
id="channel_modal.privateName"
values={Object {}}
/>
<FormattedMessage
defaultMessage=" - Only invited members can join this channel."
id="channel_modal.privateHint"
values={Object {}}
/>
</div>
</div>
</div>
</div>
Expand Down Expand Up @@ -374,24 +378,28 @@ exports[`components/NewChannelModal should match snapshot, display only public c
className="col-sm-9"
>
<div
className="type-container"
className="type-container multi-select__radio"
>
<div
className="flex-parent"
className="radio"
>
<GlobeIcon
className="icon icon__globe icon--body type-icon"
/>
<FormattedMessage
defaultMessage="Public"
id="channel_modal.publicName"
values={Object {}}
/>
<FormattedMessage
defaultMessage=" - Anyone can join this channel."
id="channel_modal.publicHint"
values={Object {}}
/>
<div
className="flex-parent"
>
<GlobeIcon
className="icon icon__globe icon--body type-icon"
/>
<FormattedMessage
defaultMessage="Public"
id="channel_modal.publicName"
values={Object {}}
/>
<FormattedMessage
defaultMessage=" - Anyone can join this channel."
id="channel_modal.publicHint"
values={Object {}}
/>
</div>
</div>
</div>
</div>
Expand Down
8 changes: 5 additions & 3 deletions components/new_channel_modal/new_channel_modal.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -258,9 +258,11 @@ export default class NewChannelModal extends React.PureComponent {
);
} else {
typeOptions = (
<div className='type-container'>
{canCreatePublicChannel ? publicChannelDesc : null}
{canCreatePrivateChannel ? privateChannelDesc : null}
<div className='type-container multi-select__radio'>
<div className='radio'>
{canCreatePublicChannel ? publicChannelDesc : null}
{canCreatePrivateChannel ? privateChannelDesc : null}
</div>
</div>
);
}
Expand Down

0 comments on commit 1f08516

Please sign in to comment.