Merge remote-tracking branch 'origin/publish-channel-selector' into rc-next
This commit is contained in:
commit
0cc2973792
2 changed files with 6 additions and 10 deletions
|
@ -30,11 +30,14 @@ export default class ChannelSelector extends React.PureComponent {
|
|||
if (!channels.length && !fetchingChannels) {
|
||||
fetchChannelListMine();
|
||||
}
|
||||
this.setState({ currentSelectedValue: channelName });
|
||||
}
|
||||
|
||||
componentDidUpdate() {
|
||||
const { channelName } = this.props;
|
||||
if (this.state.currentSelectedValue !== channelName) {
|
||||
componentWillReceiveProps(nextProps) {
|
||||
const { channels: prevChannels = [], channelName } = this.props;
|
||||
const { channels = [] } = nextProps;
|
||||
|
||||
if (channels.length !== prevChannels.length && channelName !== this.state.currentSelectedValue) {
|
||||
this.setState({ currentSelectedValue: channelName });
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1096,13 +1096,6 @@ class PublishPage extends React.PureComponent {
|
|||
/>
|
||||
</View>
|
||||
|
||||
<View style={publishStyle.warning}>
|
||||
<Text style={publishStyle.warningText}>
|
||||
Please ensure that you have filled everything correctly as you cannot edit published content in this
|
||||
release. This feature will be available in a future release.
|
||||
</Text>
|
||||
</View>
|
||||
|
||||
<View style={publishStyle.actionButtons}>
|
||||
{(this.state.publishStarted || publishFormValues.publishing) && (
|
||||
<View style={publishStyle.progress}>
|
||||
|
|
Loading…
Add table
Reference in a new issue