033b550 · bridge · git.iko.soy

src/components/GlobalErrorBoundary.js+2−2

compare with master

unifiedsplit

@@ -1,7 +1,7 @@

1import React, { useMemo } from 'react';

2import newGithubIssueUrl from 'new-github-issue-url';

3import { OutButton, RestartButton } from './Buttons';

4−import { version } from '../../package.json';

4+import { versionLabel } from 'lib/flags';

5

6const buildTitle = error => `Error Report: ${error.message}`;

7

@@ -19,7 +19,7 @@ const buildBody = error => `\n

19${error.stack}

20\`\`\`

21\n

22−In Bridge version ${version}.\n

22+In Bridge version ${versionLabel}.\n

23`;

24

25/**

src/lib/flags.js+3

@@ -1,3 +1,6 @@

1+import { version } from '../../package.json';

2+

1// are we running bridge in a development build

3// are we running bridge in a development build

2export const isDevelopment = process.env.NODE_ENV === 'development';

4export const isDevelopment = process.env.NODE_ENV === 'development';

3export const isRopsten = process.env.REACT_APP_ROPSTEN === 'true';

5export const isRopsten = process.env.REACT_APP_ROPSTEN === 'true';

6+export const versionLabel = `${version}${isRopsten ? 'r' : ''}`;

src/views/Login.tsx+2−6

@@ -1,8 +1,7 @@

1import React, { useCallback, useState } from 'react';

2import { Grid, Text, Button, Flex, LinkButton } from 'indigo-react';

3

4−import { version } from '../../package.json';

5−import { isRopsten } from 'lib/flags';

4+import { versionLabel } from 'lib/flags';

6

5

7import { useHistory } from 'store/history';

6import { useHistory } from 'store/history';

8

7

@@ -125,10 +124,7 @@ export default function Login() {

125 className="us-none pointer">

124 className="us-none pointer">

126 <span className="underline">Offline</span> ↗

125 <span className="underline">Offline</span> ↗

127 </Flex.Item>

126 </Flex.Item>

128− <Flex.Item className="gray4">

127+ <Flex.Item className="gray4">{versionLabel}</Flex.Item>

129− v{version}

130− {isRopsten ? 'r' : ''}

131− </Flex.Item>

132 </Flex>

128 </Flex>

133 </Footer>

129 </Footer>

134 </View>

130 </View>