dcdb300 · bridge · git.iko.soy

git.iko.soy/bridge

on master help sign in

qol: PR feedback

dcdb300tomholford5 years ago

package.json+3−1

compare with master

unifiedsplit

@@ -96,18 +96,20 @@

96 "scripts": {

97 "start": "react-scripts start",

98 "build": "react-scripts build",

99+ "build:ropsten": "REACT_APP_ROPSTEN=true react-scripts build",

99 "test": "react-scripts test --env=jsdom",

100 "test": "react-scripts test --env=jsdom",

100 "eject": "react-scripts eject",

101 "eject": "react-scripts eject",

101 "checksum": "cd build && find . -exec shasum -a256 {} ';' > ../checksums.txt && cd ..",

102 "checksum": "cd build && find . -exec shasum -a256 {} ';' > ../checksums.txt && cd ..",

102 "zip": "zip -ur bridge-$npm_package_version.zip README.md bridge-https.py checksums.txt && cd build && zip -ur ../bridge-$npm_package_version.zip ./* && cd ..",

103 "zip": "zip -ur bridge-$npm_package_version.zip README.md bridge-https.py checksums.txt && cd build && zip -ur ../bridge-$npm_package_version.zip ./* && cd ..",

103 "release": "npm install && npm run build && npm run checksum && npm run zip",

104 "release": "npm install && npm run build && npm run checksum && npm run zip",

105+ "release:ropsten": "npm install && npm run build:ropsten && npm run checksum && npm run zip",

104 "pilot:ganache": "ganache-cli --blockTime 1 --networkId 5 --host '0.0.0.0' -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",

106 "pilot:ganache": "ganache-cli --blockTime 1 --networkId 5 --host '0.0.0.0' -m 'benefit crew supreme gesture quantum web media hazard theory mercy wing kitten' > /dev/null &",

105 "pilot:setup": "npm run pilot:ganache && truffle deploy",

107 "pilot:setup": "npm run pilot:ganache && truffle deploy",

106 "pilot": "HTTPS=true npm-run-all pilot:setup start pilot:cleanup --continue-on-error",

108 "pilot": "HTTPS=true npm-run-all pilot:setup start pilot:cleanup --continue-on-error",

107 "pilot-invites": "WITH_TEST_STATE=INVITES npm run pilot",

109 "pilot-invites": "WITH_TEST_STATE=INVITES npm run pilot",

108 "pilot-release": "WITH_TEST_STATE=STAR_RELEASE npm run pilot",

110 "pilot-release": "WITH_TEST_STATE=STAR_RELEASE npm run pilot",

109 "pilot-residents": "WITH_TEST_STATE=RESIDENTS npm run pilot",

111 "pilot-residents": "WITH_TEST_STATE=RESIDENTS npm run pilot",

110− "pilot-ropsten": "REACT_APP_ROPSTEN=true npm run pilot",

112+ "pilot-ropsten": "REACT_APP_ROPSTEN=true HTTPS=true npm-run-all start --continue-on-error",

111 "pilot:cleanup": "pkill -f ganache-cli",

113 "pilot:cleanup": "pkill -f ganache-cli",

112 "lint:check": "eslint 'src/**/*.js'",

114 "lint:check": "eslint 'src/**/*.js'",

113 "lint:fix": "eslint --fix 'src/**/*.js'",

115 "lint:fix": "eslint --fix 'src/**/*.js'",

src/views/Login.tsx+5−1

@@ -2,6 +2,7 @@ import React, { useCallback, useState } from 'react';

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

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

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

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

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

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

124 className="us-none pointer">

125 className="us-none pointer">

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

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

126 </Flex.Item>

127 </Flex.Item>

127− <Flex.Item className="gray4">v{version}</Flex.Item>

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

129+ v{version}

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

131+ </Flex.Item>

128 </Flex>

132 </Flex>

129 </Footer>

133 </Footer>

130 </View>

134 </View>