Skip to content

Commit 4d0dc52

Browse files
author
Matthias Rütten
committed
Show the "new update" notice only when the new version has a higher number 😉
1 parent f577f12 commit 4d0dc52

File tree

4 files changed

+18
-3
lines changed

4 files changed

+18
-3
lines changed

package.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,7 @@
9797
"@types/webdriverio": "^5.0.0",
9898
"@types/webpack-env": "^1.13.3",
9999
"babel-loader": "^8.0.6",
100+
"compare-versions": "^3.5.1",
100101
"copy-webpack-plugin": "^5.0.4",
101102
"cross-env": "^6.0.0",
102103
"css-loader": "^3.2.0",

src/renderer/components/Content.tsx

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,12 +7,10 @@ import { MergeRequestsPage } from './merge-requests/MergeRequestsPage'
77
import { SettingsPage } from './settings/SettingsPage'
88
import { AboutUsPage } from './about-us/AboutUsPage'
99
import { UpdateInfoPage } from './update/UpdateInfoPage'
10-
import { useUpdater } from '../hooks/updater'
1110
import { NewUpdateAlert } from './update/NewUpdateAlert'
1211

1312
export const Content: React.FunctionComponent = () => {
1413
const { config } = useConfig()
15-
const { updateInfo } = useUpdater()
1614

1715
return (
1816
<Box>
@@ -28,7 +26,7 @@ export const Content: React.FunctionComponent = () => {
2826
</Route>
2927
{config ? (
3028
<Route path='/'>
31-
{updateInfo && <NewUpdateAlert />}
29+
<NewUpdateAlert />
3230
<MergeRequestsPage />
3331
</Route>
3432
) : (

src/renderer/components/update/NewUpdateAlert.tsx

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,19 @@
11
import * as React from 'react'
22
import { Box, Flex, Text } from 'rebass'
33
import { Link } from 'react-router-dom'
4+
import { remote } from 'electron'
5+
import * as compareVersions from 'compare-versions'
6+
7+
import { useUpdater } from '../../hooks/updater'
48

59
export const NewUpdateAlert = () => {
10+
const currentVersion = remote.app.getVersion()
11+
const { updateInfo } = useUpdater()
12+
13+
if (!updateInfo || compareVersions(updateInfo.updateInfo.version, currentVersion) < 1) {
14+
return null
15+
}
16+
617
return (
718
<Box py={1} px={2} sx={{ position: 'sticky', zIndex: 2, top: 0, borderBottom: '1px solid', borderColor: 'shadow' }} bg='siteBackground'>
819
<Text fontWeight='bold' color='red' letterSpacing={1} sx={{ textTransform: 'uppercase' }} fontSize={'12px'}>

yarn.lock

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2936,6 +2936,11 @@ commondir@^1.0.1:
29362936
resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
29372937
integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
29382938

2939+
compare-versions@^3.5.1:
2940+
version "3.5.1"
2941+
resolved "https://registry.yarnpkg.com/compare-versions/-/compare-versions-3.5.1.tgz#26e1f5cf0d48a77eced5046b9f67b6b61075a393"
2942+
integrity sha512-9fGPIB7C6AyM18CJJBHt5EnCZDG3oiTJYy0NjfIAGjKpzv0tkxWko7TNQHF5ymqm7IH03tqmeuBxtvD+Izh6mg==
2943+
29392944
component-emitter@^1.2.1, component-emitter@^1.3.0:
29402945
version "1.3.0"
29412946
resolved "https://registry.yarnpkg.com/component-emitter/-/component-emitter-1.3.0.tgz#16e4070fba8ae29b679f2215853ee181ab2eabc0"

0 commit comments

Comments
 (0)