Merge branch 'master' into refresh-fix

CHANGELOG.md

@@ -32,6 +32,7 @@ Web UI version numbers should always match the corresponding version of LBRY App
   * Fixed downloading files that are deleted not being removed from the downloading list
   * Fixed download progress bar not being cleared when a downloading file is deleted
   * Fixed refresh regression after adding scroll position to history state
+  * Fixed app thinking downloads with 0 progress were downloaded after restart
 
 ### Deprecated
   *

build/build.ps1

@@ -46,8 +46,8 @@ dir dist # verify that binary was built/named correctly
 
 # sign binary
 nuget install secure-file -ExcludeVersion
-secure-file\tools\secure-file -decrypt build\lbry2.pfx.enc -secret "$env:pfx_key"
-& ${env:SIGNTOOL_PATH} sign /f build\lbry2.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe
+secure-file\tools\secure-file -decrypt build\lbry3.pfx.enc -secret "$env:pfx_key"
+& ${env:SIGNTOOL_PATH} sign /f build\lbry3.pfx /p "$env:key_pass" /tr http://tsa.starfieldtech.com /td SHA256 /fd SHA256 dist\*.exe
 
 
 python build\upload_assets.py

ui/js/component/fileActions/view.jsx

@@ -118,7 +118,10 @@ class FileActions extends React.PureComponent {
           />
         </div>
       );
-    } else if (fileInfo === null && !downloading) {
+    } else if (
+      (fileInfo === null || (fileInfo && fileInfo.written_bytes === 0)) &&
+      !downloading
+    ) {
       if (!costInfo) {
         content = <BusyMessage message={__("Fetching cost info")} />;
       } else {

ui/js/component/userEmailVerify/view.jsx

@@ -35,7 +35,6 @@ class UserEmailVerify extends React.PureComponent {
         <FormRow
           type="text"
           label={__("Verification Code")}
-          placeholder="a94bXXXXXXXXXXXXXX"
           name="code"
           value={this.state.code}
           onChange={event => {
@@ -46,7 +45,7 @@ class UserEmailVerify extends React.PureComponent {
         {/* render help separately so it always shows */}
         <div className="form-field__helper">
           <p>
-            {__("Email")}{" "}
+            {__("Check your email for a verification code. Email")}{" "}
             <Link href="mailto:help@lbry.io" label="help@lbry.io" />{" "}
             {__("if you did not receive or are having trouble with your code.")}
           </p>