diff --git a/.github/ISSUE_TEMPLATE/integration_help.md b/.github/ISSUE_TEMPLATE/integration_help.md index 1e4d62f655..22cbdf54f5 100644 --- a/.github/ISSUE_TEMPLATE/integration_help.md +++ b/.github/ISSUE_TEMPLATE/integration_help.md @@ -5,10 +5,10 @@ about: Do you need assistance with building the Uppy client in your bundler, or labels: Not Accepted, Triage --- -Transloadit is providing Uppy free of charge. If you want, you can self-host all of its components and never pay us a dime. There are docs and tests, and your Bug Reports and Feature Requests are always welcome on GitHub. +Transloadit is providing Uppy free of charge. If you want, you can self-host all its components and never pay us a dime. You can access docs and tests, and your Bug Reports and Feature Requests are always welcome on GitHub. -There is also a different category of support that we like to call Integration Help: assistance to make things work for your environment, that have already been reported as working for the larger community. +We offer also a different category of support that we like to call Integration Help: help to make things work for your environment, that have already been reported as working for the larger community. -As much as we at Transloadit would like to provide detailed Integration Help to every non-paying user, Uppy has reached a point where this is no longer sustainable for our small crew. If we end up investing our time in a million different apps that use Uppy, as long as there is no money flowing back, we won't be able to ramp up our team to meet the demand. This would spread the team ever thinner and eventually grind development to a halt. +As much as we at Transloadit would like to provide detailed Integration Help to every non-paying user, Uppy has reached a point where this is no longer sustainable for our small crew. If we end up investing our time in a million different apps that use Uppy, as long as no money is flowing back, we won’t be able to ramp up our team to meet the demand. This would spread the team ever thinner and eventually grind development to a halt. -That is not where we want to be. So, in order to offer enthusiasts, businesses, and enterprises assistance in a sustainable way, we're providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . +That is not where we want to be. So, to offer enthusiasts, businesses, and enterprises help in a sustainable way, we’re providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js index c9c974b286..b7d08afd05 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js +++ b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js @@ -77,7 +77,7 @@ const ErrorButton = ({ file, onClick }) => { if (file.error) { return ( + + - ) } diff --git a/packages/@uppy/status-bar/src/StatusBar.js b/packages/@uppy/status-bar/src/StatusBar.js index 7f52cbeee6..b5ab955e81 100644 --- a/packages/@uppy/status-bar/src/StatusBar.js +++ b/packages/@uppy/status-bar/src/StatusBar.js @@ -139,7 +139,7 @@ function StatusBar (props) { && !hidePauseResumeButton && uploadState === STATE_UPLOADING - const showRetryBtn = error && !hideRetryButton + const showRetryBtn = error && !isAllComplete && !hideRetryButton const showDoneBtn = doneButtonHandler && uploadState === STATE_COMPLETE @@ -171,15 +171,18 @@ function StatusBar (props) { switch (uploadState) { case STATE_PREPROCESSING: case STATE_POSTPROCESSING: - return ( - - ) + return case STATE_COMPLETE: return case STATE_ERROR: - return + return ( + + ) case STATE_UPLOADING: return ( - {(recoveredState || showUploadBtn) ? ( + {recoveredState || showUploadBtn ? (
- +