diff --git a/package.json b/package.json index 89c12a7..37ce2c8 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "base-64": "^0.1.0", "@expo/vector-icons": "^8.1.0", "gfycat-style-urls": "^1.0.3", - "lbry-redux": "lbryio/lbry-redux#3133ea60b0302c162f7b6f67cc858997f1d2ab52", + "lbry-redux": "lbryio/lbry-redux#123efacf4d45289ebda9dc291976d475de227a55", "lbryinc": "lbryio/lbryinc#b9f354ae50bd57691765a7d042c5054167878bf4", "lodash": ">=4.17.11", "merge": ">=1.2.1", diff --git a/src/component/channelSelector/view.js b/src/component/channelSelector/view.js index 4584ce9..e5e8c29 100644 --- a/src/component/channelSelector/view.js +++ b/src/component/channelSelector/view.js @@ -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 }); } } diff --git a/src/component/rewardCard/view.js b/src/component/rewardCard/view.js index 0e35ab5..e5faaca 100644 --- a/src/component/rewardCard/view.js +++ b/src/component/rewardCard/view.js @@ -13,6 +13,7 @@ type Props = { id: string, reward_title: string, reward_amount: number, + reward_range?: string, transaction_id: string, created_at: string, reward_description: string, @@ -55,6 +56,20 @@ class RewardCard extends React.PureComponent { }); }; + getDisplayAmount = () => { + const { reward } = this.props; + if (reward) { + if (reward.reward_range && reward.reward_range.includes('-')) { + return reward.reward_range.split('-')[0] + '+'; // ex: 5+ + } else if (reward.reward_amount > 0) { + return reward.reward_amount; + } + } + + // unknown amount which normally shouldn't happen + return '?'; + }; + render() { const { canClaim, isPending, onClaimPress, reward } = this.props; const claimed = !!reward.transaction_id; @@ -101,7 +116,7 @@ class RewardCard extends React.PureComponent { )} - {reward.reward_amount} + {this.getDisplayAmount()} LBC diff --git a/src/page/channelCreator/view.js b/src/page/channelCreator/view.js index f076e3d..c920055 100644 --- a/src/page/channelCreator/view.js +++ b/src/page/channelCreator/view.js @@ -390,7 +390,7 @@ export default class ChannelCreator extends React.PureComponent { return; } - if (email.trim().length > 0 && (email.indexOf('@') === -1 || email.indexOf('.') === -1)) { + if (email && email.trim().length > 0 && (email.indexOf('@') === -1 || email.indexOf('.') === -1)) { notify({ message: 'Please provide a valid email address.' }); return; } diff --git a/src/page/publish/view.js b/src/page/publish/view.js index 6972193..9b84f4a 100644 --- a/src/page/publish/view.js +++ b/src/page/publish/view.js @@ -1096,17 +1096,10 @@ class PublishPage extends React.PureComponent { /> - - - 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. - - - {(this.state.publishStarted || publishFormValues.publishing) && ( - + )}