From 6d3c46c0cb224cd93efd82edc8941c8e1c290621 Mon Sep 17 00:00:00 2001 From: Jeff Gordon Date: Mon, 30 Mar 2020 02:07:28 -0500 Subject: [PATCH 1/2] Linux About Modal Updated the "About GitHub Desktop" model to remove the button to check for updates (since it didn't do anything on Linux) and replace with a link to the linux releases page --- app/src/ui/about/about.tsx | 19 ++++++++++++++++++- app/src/ui/lib/releases.ts | 1 + 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index 6b6d5ac2ee3..ce63ea74517 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -15,6 +15,7 @@ import { Loading } from '../lib/loading' import { RelativeTime } from '../relative-time' import { assertNever } from '../../lib/fatal-error' import { ReleaseNotesUri } from '../lib/releases' +import { LinuxReleasesUri } from '../lib/releases' import { encodePathAsUrl } from '../../lib/path' const DesktopLogo = encodePathAsUrl(__dirname, 'static/logo-64x64@2x.png') @@ -94,6 +95,17 @@ export class About extends React.Component { return null } + if (__LINUX__) { + const linuxReleaseLink = ( + View Linux Releases + ) + return ( + +

{linuxReleaseLink}

+
+ ) + } + const updateStatus = this.state.updateState.status switch (updateStatus) { @@ -169,7 +181,12 @@ export class About extends React.Component { private renderUpdateDetails() { if (__LINUX__) { - return null + return ( +

+ Please visit the GitHub Desktop for Linux release page for + Linux-specific release notes and to download the latest version. +

+ ) } if ( diff --git a/app/src/ui/lib/releases.ts b/app/src/ui/lib/releases.ts index c9eb3a5b3b5..c6d0e0fa924 100644 --- a/app/src/ui/lib/releases.ts +++ b/app/src/ui/lib/releases.ts @@ -1 +1,2 @@ export const ReleaseNotesUri = 'https://desktop.github.com/release-notes/' +export const LinuxReleasesUri = 'https://github.com/shiftkey/desktop/releases/' From a87d7a9a64306bccfc1ebc56fb932626f8375591 Mon Sep 17 00:00:00 2001 From: Jeff Gordon Date: Mon, 30 Mar 2020 11:05:51 -0500 Subject: [PATCH 2/2] Clean Up Updated to consolidate import and removed the word "Linux" from the release link --- app/src/ui/about/about.tsx | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/src/ui/about/about.tsx b/app/src/ui/about/about.tsx index ce63ea74517..9b2a0887512 100644 --- a/app/src/ui/about/about.tsx +++ b/app/src/ui/about/about.tsx @@ -14,8 +14,7 @@ import { Disposable } from 'event-kit' import { Loading } from '../lib/loading' import { RelativeTime } from '../relative-time' import { assertNever } from '../../lib/fatal-error' -import { ReleaseNotesUri } from '../lib/releases' -import { LinuxReleasesUri } from '../lib/releases' +import { ReleaseNotesUri, LinuxReleasesUri } from '../lib/releases' import { encodePathAsUrl } from '../../lib/path' const DesktopLogo = encodePathAsUrl(__dirname, 'static/logo-64x64@2x.png') @@ -97,7 +96,7 @@ export class About extends React.Component { if (__LINUX__) { const linuxReleaseLink = ( - View Linux Releases + View Releases ) return (