diff --git a/.gitignore b/.gitignore index f57e421ea..661998b1d 100644 --- a/.gitignore +++ b/.gitignore @@ -3,3 +3,5 @@ /static/daemon/lbrynet* /static/locales yarn-error.log +package-lock.json +.idea/ \ No newline at end of file diff --git a/CHANGELOG.md b/CHANGELOG.md index 7b98ffb99..00bd560df 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -6,7 +6,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/). ## [Unreleased] ### Added + * Add ability to resend verification email ([#1492](https://github.com/lbryio/lbry-app/issues/1492)) + * Add Narrative about Feature Request on Help Page and Report Page ([#1551](https://github.com/lbryio/lbry-app/pull/1551)) * Add keyboard shortcut to quit the app on Windows ([#1202](https://github.com/lbryio/lbry-app/pull/1202)) * Build for both architectures (x86 and x64) for Windows ([#1262](https://github.com/lbryio/lbry-app/pull/1262)) * Add referral FAQ to Invites screen([#1314](https://github.com/lbryio/lbry-app/pull/1314)) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 07edc7648..7442045af 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -147,7 +147,7 @@ There are a few tools integrated to the project that will ease the process of de If someone has been officially assigned an issue via Github's assignment system, it is also not available. Contributors are encouraged to ask if they have any questions about issue availability. * The [changelog](https://github.com/lbryio/lbry-app/blob/master/CHANGELOG.md) should be updated to - include a referene to the fix/change/addition. See previous entries for format. + include a reference to the fix/change/addition. See previous entries for format. * Once the pull request is visible in the LBRY repo, a LBRY team member will review it and make sure it is up to our standards. At this point, the contributor may have to change his or her code based on our suggestions and comments. diff --git a/package.json b/package.json index f481cb6b9..f31f046de 100644 --- a/package.json +++ b/package.json @@ -48,7 +48,7 @@ "formik": "^0.10.4", "hast-util-sanitize": "^1.1.2", "keytar": "^4.2.1", - "lbry-redux": "lbryio/lbry-redux#543af2fcee7e4c45ccaf73af7b47d4b1a5d8ad44", + "lbry-redux": "lbryio/lbry-redux#7759bc6e8c482bed173d1f10aee6f6f9a439a15a", "localforage": "^1.7.1", "mixpanel-browser": "^2.17.1", "moment": "^2.22.0", diff --git a/src/renderer/component/common/file-selector.jsx b/src/renderer/component/common/file-selector.jsx index d5d12cfde..d07d52dbb 100644 --- a/src/renderer/component/common/file-selector.jsx +++ b/src/renderer/component/common/file-selector.jsx @@ -9,6 +9,8 @@ type Props = { type: string, currentPath: ?string, onFileChosen: (string, string) => void, + fileLabel: ?string, + directoryLabel?: string, }; class FileSelector extends React.PureComponent { @@ -47,15 +49,14 @@ class FileSelector extends React.PureComponent { input: ?HTMLInputElement; render() { - const { type, currentPath } = this.props; + const { type, currentPath, fileLabel, directoryLabel } = this.props; + + const label = + type === 'file' ? fileLabel || __('Choose File') : directoryLabel || __('Choose Directory'); return ( -