From d39664a0fdfb1810c64c8b5323f3c2f2982f1776 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 29 Sep 2017 16:05:26 -0400 Subject: [PATCH 01/12] fix #624, remove unnecessary settings state --- ui/js/page/settings/view.jsx | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/ui/js/page/settings/view.jsx b/ui/js/page/settings/view.jsx index 186abbb5c..27cb1c9f0 100644 --- a/ui/js/page/settings/view.jsx +++ b/ui/js/page/settings/view.jsx @@ -13,8 +13,6 @@ class SettingsPage extends React.PureComponent { super(props); this.state = { - instantPurchaseEnabled: props.instantPurchaseEnabled, - instantPurchaseMax: props.instantPurchaseMax, clearingCache: false, }; } @@ -49,7 +47,14 @@ class SettingsPage extends React.PureComponent { } onKeyFeeChange(newValue) { - this.setDaemonSetting("max_key_fee", newValue); + let setting = newValue; + + //this is stupid and should be fixed... somewhere + if (setting && (setting.amount === undefined || setting.amount === null)) { + setting.amount = 0; + } + + this.setDaemonSetting("max_key_fee", setting); } onKeyFeeDisableChange(isDisabled) { @@ -61,20 +66,12 @@ class SettingsPage extends React.PureComponent { this.props.setClientSetting(settings.THEME, value); } - oninstantPurchaseEnabledChange(enabled) { + onInstantPurchaseEnabledChange(enabled) { this.props.setClientSetting(settings.INSTANT_PURCHASE_ENABLED, enabled); - - this.setState({ - instantPurchaseEnabled: enabled, - }); } onInstantPurchaseMaxChange(newValue) { this.props.setClientSetting(settings.INSTANT_PURCHASE_MAX, newValue); - - this.setState({ - instantPurchaseMax: newValue, - }); } // onMaxUploadPrefChange(isLimited) { @@ -245,31 +242,31 @@ class SettingsPage extends React.PureComponent { { - this.oninstantPurchaseEnabledChange(false); + this.onInstantPurchaseEnabledChange(false); }} />
{ - this.oninstantPurchaseEnabledChange(true); + this.onInstantPurchaseEnabledChange(true); }} /> - {this.state.instantPurchaseEnabled && + {instantPurchaseEnabled && this.onInstantPurchaseMaxChange(val)} - defaultValue={this.state.instantPurchaseMax} + defaultValue={instantPurchaseMax} />}
From ca6ef4e11f28d3161174f8294fb2bc3098a0043a Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 29 Sep 2017 16:51:36 -0400 Subject: [PATCH 02/12] fix all step properties, removing publish or send minimums app-side --- ui/js/component/formFieldPrice/view.jsx | 4 ++-- ui/js/component/publishForm/internal/channelSection.jsx | 2 +- ui/js/component/publishForm/view.jsx | 4 +--- ui/js/component/walletSend/view.jsx | 2 +- ui/js/component/walletSendTip/view.jsx | 2 +- ui/js/page/settings/view.jsx | 2 -- 6 files changed, 6 insertions(+), 10 deletions(-) diff --git a/ui/js/component/formFieldPrice/view.jsx b/ui/js/component/formFieldPrice/view.jsx index ed85a05b9..81c97c8e8 100644 --- a/ui/js/component/formFieldPrice/view.jsx +++ b/ui/js/component/formFieldPrice/view.jsx @@ -34,7 +34,7 @@ class FormFieldPrice extends React.PureComponent { } render() { - const { defaultValue, placeholder, min, step } = this.props; + const { defaultValue, placeholder, min } = this.props; return ( @@ -43,7 +43,7 @@ class FormFieldPrice extends React.PureComponent { name="amount" min={min} placeholder={placeholder || null} - step={step} + step="any" //Unfortunately, you cannot set a step without triggering validation that enforces a multiple of the step onChange={event => this.handleFeeAmountChange(event)} defaultValue={ defaultValue && defaultValue.amount ? defaultValue.amount : "" diff --git a/ui/js/component/publishForm/internal/channelSection.jsx b/ui/js/component/publishForm/internal/channelSection.jsx index cbd2669b9..c89218415 100644 --- a/ui/js/component/publishForm/internal/channelSection.jsx +++ b/ui/js/component/publishForm/internal/channelSection.jsx @@ -148,7 +148,7 @@ class ChannelSection extends React.PureComponent { - {/*min=0.01 caused weird interactions with step (e.g. down from 5 equals 4.91 rather than 4.9) */} this.handleFeeChange(val)} /> @@ -823,7 +821,7 @@ class PublishForm extends React.PureComponent { { diff --git a/ui/js/component/walletSend/view.jsx b/ui/js/component/walletSend/view.jsx index 3e65cceab..942cec9e5 100644 --- a/ui/js/component/walletSend/view.jsx +++ b/ui/js/component/walletSend/view.jsx @@ -33,7 +33,7 @@ class WalletSend extends React.PureComponent { this.onInstantPurchaseMaxChange(val)} defaultValue={instantPurchaseMax} />} From 72ad1552cb3a98a58199504c3bca79ea67619d27 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Fri, 29 Sep 2017 16:52:01 -0400 Subject: [PATCH 03/12] =?UTF-8?q?Bump=20version:=200.16.0=20=E2=86=92=200.?= =?UTF-8?q?16.1rc1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .bumpversion.cfg | 2 +- app/package.json | 2 +- ui/package.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.bumpversion.cfg b/.bumpversion.cfg index 206eca6b6..8f0a3e7b2 100644 --- a/.bumpversion.cfg +++ b/.bumpversion.cfg @@ -1,5 +1,5 @@ [bumpversion] -current_version = 0.16.0 +current_version = 0.16.1rc1 commit = True tag = True parse = (?P\d+)\.(?P\d+)\.(?P\d+)((?P[a-z]+)(?P\d+))? diff --git a/app/package.json b/app/package.json index a5495a156..0b89f2a1e 100644 --- a/app/package.json +++ b/app/package.json @@ -1,6 +1,6 @@ { "name": "LBRY", - "version": "0.16.0", + "version": "0.16.1rc1", "main": "main.js", "description": "A browser for the LBRY network, a digital marketplace controlled by its users.", "author": { diff --git a/ui/package.json b/ui/package.json index 82f5d0889..953ae7d70 100644 --- a/ui/package.json +++ b/ui/package.json @@ -1,6 +1,6 @@ { "name": "lbry-web-ui", - "version": "0.16.0", + "version": "0.16.1rc1", "description": "LBRY UI", "scripts": { "test": "echo \"Error: no test specified\" && exit 1", From ab3aa0501c1bb4504f2187696a867d578d2a7d0c Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Fri, 29 Sep 2017 17:15:14 -0600 Subject: [PATCH 04/12] fix for empty channels #636 --- ui/js/actions/content.js | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index f6a5ac94b..1348c4af4 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -384,16 +384,15 @@ export function doFetchClaimsByChannel(uri, page) { }); lbry.claim_list_by_channel({ uri, page: page || 1 }).then(result => { - const claimResult = result[uri], - claims = claimResult ? claimResult.claims_in_channel : [], - currentPage = claimResult ? claimResult.returned_page : undefined; + const claimResult = result[uri] || {}; + const { claims_in_channel, returned_page } = claimResult; dispatch({ type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, data: { uri, - claims, - page: currentPage, + claims: claims_in_channel || [], + page: returned_page, }, }); }); From 78232eb2a9d58b773852119af50cb11d30aae0e2 Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Fri, 29 Sep 2017 17:25:53 -0600 Subject: [PATCH 05/12] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 342ec92a4..d1f61d5c1 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Web UI version numbers should always match the corresponding version of LBRY App * While editing a publish, the URL will no longer change if you select a new file. (#601) * Fixed issues with opening the folder for a file (#606) * Be consistent with the step property on credit inputs (#604) + * Fixed channel fetching without claims (#634) ### Deprecated * From 36c106e16c454f5d9e0c6d8cc29e05a84ad8fa63 Mon Sep 17 00:00:00 2001 From: btzr-io Date: Sat, 30 Sep 2017 09:36:13 -0600 Subject: [PATCH 06/12] fix wrong page number --- ui/js/actions/content.js | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index 1348c4af4..7eb16be8f 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -386,13 +386,15 @@ export function doFetchClaimsByChannel(uri, page) { lbry.claim_list_by_channel({ uri, page: page || 1 }).then(result => { const claimResult = result[uri] || {}; const { claims_in_channel, returned_page } = claimResult; + const claims = claims_in_channel || []; + const page = returned_page || undefined; dispatch({ type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, data: { uri, - claims: claims_in_channel || [], - page: returned_page, + claims, + page, }, }); }); From 449997ff6ec9e4c56cf7876375ac507bea51bf5b Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Sat, 30 Sep 2017 20:50:32 -0600 Subject: [PATCH 07/12] fix #605 Don't play video if you can't pay for it :( --- ui/js/actions/content.js | 1 + 1 file changed, 1 insertion(+) diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index f6a5ac94b..6d59bde7f 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -351,6 +351,7 @@ export function doPurchaseUri(uri) { const { cost } = costInfo; if (cost > balance) { + dispatch(doSetPlayingUri(null)); dispatch(doOpenModal(modals.INSUFFICIENT_CREDITS)); return Promise.resolve(); } From c25ee25482255abace5e84ae1f74dcc99518e805 Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Sat, 30 Sep 2017 21:01:47 -0600 Subject: [PATCH 08/12] update change log --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 342ec92a4..62c5f9813 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Web UI version numbers should always match the corresponding version of LBRY App * While editing a publish, the URL will no longer change if you select a new file. (#601) * Fixed issues with opening the folder for a file (#606) * Be consistent with the step property on credit inputs (#604) + * Fixed issue after accessing a video without enough credits (#605) ### Deprecated * From 45ca07115b896f8d424daaa7c00444fe0549b6fe Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Sat, 30 Sep 2017 23:39:00 -0600 Subject: [PATCH 09/12] Fix #643 Reset playing uri --- ui/js/actions/content.js | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index 6d59bde7f..47ad21272 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -295,6 +295,7 @@ export function doLoadVideo(uri) { streamInfo.error == "Timeout"; if (timeout) { + dispatch(doSetPlayingUri(null)); dispatch({ type: types.LOADING_VIDEO_FAILED, data: { uri }, @@ -306,6 +307,7 @@ export function doLoadVideo(uri) { } }) .catch(error => { + dispatch(doSetPlayingUri(null)); dispatch({ type: types.LOADING_VIDEO_FAILED, data: { uri }, From 732b8d219fcc6d33631c9ebdd4c377c554fabb7d Mon Sep 17 00:00:00 2001 From: Baltazar Gomez Date: Sat, 30 Sep 2017 23:47:45 -0600 Subject: [PATCH 10/12] update changelog --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 62c5f9813..2bb343f8b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -21,6 +21,7 @@ Web UI version numbers should always match the corresponding version of LBRY App * While editing a publish, the URL will no longer change if you select a new file. (#601) * Fixed issues with opening the folder for a file (#606) * Be consistent with the step property on credit inputs (#604) + * Fixed issue when file fails to download (#642) * Fixed issue after accessing a video without enough credits (#605) ### Deprecated From 3539d78d0aa6393e8d4afbc669677b4af2b0de7b Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Sun, 1 Oct 2017 12:48:31 -0400 Subject: [PATCH 11/12] prevent overwriting variable --- ui/js/actions/content.js | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/ui/js/actions/content.js b/ui/js/actions/content.js index 7eb16be8f..46d1fdd71 100644 --- a/ui/js/actions/content.js +++ b/ui/js/actions/content.js @@ -386,15 +386,13 @@ export function doFetchClaimsByChannel(uri, page) { lbry.claim_list_by_channel({ uri, page: page || 1 }).then(result => { const claimResult = result[uri] || {}; const { claims_in_channel, returned_page } = claimResult; - const claims = claims_in_channel || []; - const page = returned_page || undefined; dispatch({ type: types.FETCH_CHANNEL_CLAIMS_COMPLETED, data: { uri, - claims, - page, + claims: claims_in_channel || [], + page: returned_page || undefined, }, }); }); From a7a4e8dc163b021a225cacf7f8d2dbfedf0ffcb4 Mon Sep 17 00:00:00 2001 From: Jeremy Kauffman Date: Mon, 2 Oct 2017 08:40:42 -0400 Subject: [PATCH 12/12] remove channel length minimum, fixes #645 --- CHANGELOG.md | 1 + ui/js/component/publishForm/internal/channelSection.jsx | 7 ------- 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 0d4005374..f4b65d531 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ Web UI version numbers should always match the corresponding version of LBRY App ### Changed * Updated the daemon from 0.16.1 to [0.16.3](https://github.com/lbryio/lbry/releases/tag/v0.16.3) to improve download performance and download issue detection. + * There is no longer a minimum channel length (#645) * Changed the File page to make it clearer how to to open the folder for a file ### Fixed diff --git a/ui/js/component/publishForm/internal/channelSection.jsx b/ui/js/component/publishForm/internal/channelSection.jsx index c89218415..fefa6da84 100644 --- a/ui/js/component/publishForm/internal/channelSection.jsx +++ b/ui/js/component/publishForm/internal/channelSection.jsx @@ -53,13 +53,6 @@ class ChannelSection extends React.PureComponent { } handleCreateChannelClick(event) { - if (this.state.newChannelName.length < 5) { - this.refs.newChannelName.showError( - __("LBRY channel names must be at least 5 characters in length.") - ); - return; - } - this.setState({ creatingChannel: true, });