From 2f8af4e1fa1970ac41bce9d2936d2f6b92ecccb8 Mon Sep 17 00:00:00 2001 From: infiinte-persistence Date: Sat, 20 Jun 2020 21:40:27 +0800 Subject: [PATCH] Allow upgrade nag bar to be dismissed per session #-4368: "Users on third party builds may have to wait a few hours for the update and the bar is annoying." --- static/app-strings.json | 9 +++++++++ ui/component/app/view.jsx | 5 ++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/static/app-strings.json b/static/app-strings.json index d1cdeb974..60ecfb101 100644 --- a/static/app-strings.json +++ b/static/app-strings.json @@ -1244,6 +1244,15 @@ "YB": "YB", "Save": "Save", "Saving...": "Saving...", + "Downloading Update": "Downloading Update", + "complete": "complete", + "Click \"Begin Upgrade\" to start the upgrade process.": "Click \"Begin Upgrade\" to start the upgrade process.", + "The app will close (if not, quit with CTRL-Q), and you will be prompted to install the latest version of LBRY.": "The app will close (if not, quit with CTRL-Q), and you will be prompted to install the latest version of LBRY.", + "To launch installation manually, close LBRY (CTRL-Q) and run the command below in the terminal.": "To launch installation manually, close LBRY (CTRL-Q) and run the command below in the terminal.", + "After the install is complete, please reopen the app.": "After the install is complete, please reopen the app.", + "Note: You can also install the AppImage version for streamlined updates.": "Note: You can also install the AppImage version for streamlined updates.", + "Download here.": "Download here.", + "Begin Upgrade": "Begin Upgrade", "Thanks for the feedback! You help make the app better for everyone.": "Thanks for the feedback! You help make the app better for everyone.", "Thanks for the feedback. Mark has been notified and is currently walking over to his computer to work on this.": "Thanks for the feedback. Mark has been notified and is currently walking over to his computer to work on this.", "Changelog": "Changelog", diff --git a/ui/component/app/view.jsx b/ui/component/app/view.jsx index e9cd89bbf..d63301720 100644 --- a/ui/component/app/view.jsx +++ b/ui/component/app/view.jsx @@ -115,7 +115,9 @@ function App(props: Props) { const [lbryTvApiStatus, setLbryTvApiStatus] = useState(STATUS_OK); // @endif const { pathname, hash, search } = props.location; - const showUpgradeButton = autoUpdateDownloaded || (process.platform === 'linux' && isUpgradeAvailable); + const [upgradeNagClosed, setUpgradeNagClosed] = useState(false); + const showUpgradeButton = + (autoUpdateDownloaded || (process.platform === 'linux' && isUpgradeAvailable)) && !upgradeNagClosed; // referral claiming const referredRewardAvailable = rewards && rewards.some(reward => reward.reward_type === REWARDS.TYPE_REFEREE); const urlParams = new URLSearchParams(search); @@ -305,6 +307,7 @@ function App(props: Props) { message={__('An upgrade is available.')} actionText={__('Install Now')} onClick={requestDownloadUpgrade} + onClose={() => setUpgradeNagClosed(true)} /> )} {/* @endif */}