mirror of
https://github.com/trezor/trezor-wallet
synced 2024-12-25 16:38:08 +00:00
Merge branch 'master' of github.com:satoshilabs/trezor-wallet
This commit is contained in:
Vladimir Volek
commit
d257a64166
@ -3,4 +3,5 @@ build
|
||||
coverage
|
||||
node_modules
|
||||
src/flowtype/npm
|
||||
scripts/solidity/.*
|
||||
**/_old/*
|
||||
@ -9,7 +9,7 @@
|
||||
.*/node_modules/react-router-redux/.*
|
||||
.*/node_modules/oboe/test/.*
|
||||
.*/_old/.*
|
||||
.*/public/solidity/.*
|
||||
.*/scripts/solidity/.*
|
||||
.*/build/.*
|
||||
|
||||
[libs]
|
||||
|
||||
5
Makefile
Normal file
5
Makefile
Normal file
@ -0,0 +1,5 @@
|
||||
build:
|
||||
sh ./scripts/docker-build.sh
|
||||
|
||||
sync-%:
|
||||
sh ./scripts/s3sync.sh $*
|
||||
@ -1,4 +1,4 @@
|
||||
# Trezor Ethereum Wallet
|
||||
# Trezor Wallet
|
||||
|
||||
To install dependencies run `npm install` or `yarn`
|
||||
To start locally run `npm run dev` or `yarn run dev`
|
||||
|
||||
@ -6,7 +6,7 @@
|
||||
"bin": {
|
||||
"flow": "./node_modules/flow-bin"
|
||||
},
|
||||
"license": "T-RSL",
|
||||
"license": "SEE LICENSE IN LICENSE.md",
|
||||
"scripts": {
|
||||
"dev": "npx webpack-dev-server --config webpack/dev.babel.js",
|
||||
"dev:local": "npx webpack-dev-server --config webpack/local.babel.js",
|
||||
@ -66,7 +66,7 @@
|
||||
"styled-components": "^3.4.9",
|
||||
"styled-media-query": "^2.0.2",
|
||||
"styled-normalize": "^8.0.0",
|
||||
"trezor-connect": "^5.0.32",
|
||||
"trezor-connect": "6.0.0",
|
||||
"web3": "1.0.0-beta.35",
|
||||
"webpack": "^4.16.3",
|
||||
"webpack-build-notifier": "^0.1.29",
|
||||
|
||||
53
scripts/s3sync.sh
Normal file
53
scripts/s3sync.sh
Normal file
@ -0,0 +1,53 @@
|
||||
#!/bin/bash
|
||||
|
||||
# Before first use:
|
||||
# Install awscli (pip install awscli)
|
||||
# Configure access credentials (aws configure), region is "eu-central-1"
|
||||
|
||||
function confirm {
|
||||
read -r -p "Are you sure? [y/N] " response
|
||||
if [[ $response =~ ^(yes|y)$ ]]; then
|
||||
echo "let's go!"
|
||||
else
|
||||
exit 2
|
||||
fi
|
||||
}
|
||||
|
||||
if [ "x$1" == "x" ]; then
|
||||
echo "./s3sync.sh stage|beta|wallet [-d]"
|
||||
exit 1
|
||||
fi
|
||||
|
||||
if [ "x$1" == "xstage" ]; then
|
||||
DIST=../build/beta
|
||||
BUCKET=stage.mytrezor.com
|
||||
DISTRIBUTION_ID="E24M0QWO692FQL"
|
||||
|
||||
elif [ "x$1" == "xbeta" ]; then
|
||||
DIST=../build/beta
|
||||
BUCKET=beta.mytrezor.com
|
||||
DISTRIBUTION_ID="E1PONNHWUNCQ9M"
|
||||
|
||||
confirm
|
||||
|
||||
elif [ "x$1" == "xwallet" ]; then
|
||||
DIST=../build/prod
|
||||
BUCKET=wallet.mytrezor.com
|
||||
DISTRIBUTION_ID="EZM01GFTITGVD"
|
||||
|
||||
confirm
|
||||
|
||||
fi
|
||||
|
||||
set -e
|
||||
cd `dirname $0`
|
||||
|
||||
if [ "x$2" == "x-d" ]; then
|
||||
aws s3 sync --delete --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
|
||||
else
|
||||
aws s3 sync --cache-control 'public, max-age=3600' $DIST s3://$BUCKET/next
|
||||
fi
|
||||
|
||||
aws cloudfront create-invalidation --distribution-id $DISTRIBUTION_ID --paths '/*'
|
||||
|
||||
echo "DONE"
|
||||
@ -3,6 +3,7 @@ export const FONT_SIZE = {
|
||||
SMALLER: '12px',
|
||||
SMALL: '14px',
|
||||
BASE: '16px',
|
||||
WALLET_TITLE: '18px',
|
||||
TOP_MENU: '17px',
|
||||
BIG: '21px',
|
||||
BIGGER: '32px',
|
||||
|
||||
@ -4,15 +4,15 @@
|
||||
<meta charset="UTF-8" />
|
||||
<meta http-equiv="X-UA-Compatible" content="IE=Edge" />
|
||||
<meta name="viewport" content="width=device-width,initial-scale=1" />
|
||||
<title>Ethereum Wallet | Trezor</title>
|
||||
<title>Trezor Wallet</title>
|
||||
<meta name="title" content="Trezor Wallet" />
|
||||
<meta name="description" content="Trezor Wallet" />
|
||||
<meta name="keywords" content="trezor wallet" />
|
||||
<meta name="author" content="satoshilabs s.r.o." />
|
||||
<meta name="viewport" content="width=1024, initial-scale=1">
|
||||
<meta name="author" content="SatoshiLabs s.r.o." />
|
||||
<meta name="google" value="notranslate" />
|
||||
<!--[if lt IE 8]>
|
||||
<link media="all" rel="stylesheet" href="/unsupported-browsers/style.css" />
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet">
|
||||
<link href="https://fonts.googleapis.com/css?family=Roboto" rel="stylesheet" />
|
||||
<![endif]-->
|
||||
</head>
|
||||
<body>
|
||||
|
||||
@ -44,14 +44,6 @@ export default function modal(state: State = initialState, action: Action): Stat
|
||||
windowType: action.type,
|
||||
};
|
||||
|
||||
// device acquired
|
||||
// close modal
|
||||
case DEVICE.CHANGED:
|
||||
if (state.context === MODAL.CONTEXT_DEVICE && action.device.path === state.device.path && action.device.status === 'occupied') {
|
||||
return initialState;
|
||||
}
|
||||
return state;
|
||||
|
||||
// device connected
|
||||
// close modal if modal context is not 'device'
|
||||
case DEVICE.CONNECT:
|
||||
|
||||
@ -135,7 +135,7 @@ class InstallBridge extends PureComponent<Props, State> {
|
||||
latestVersion: props.transport.bridge.version.join('.'),
|
||||
installers,
|
||||
target: currentTarget || installers[0],
|
||||
uri: 'https://wallet.trezor.io/data/',
|
||||
uri: 'https://data.trezor.io/',
|
||||
};
|
||||
}
|
||||
|
||||
|
||||
@ -13,6 +13,7 @@ import Content from 'views/Wallet/components/Content';
|
||||
import CoinLogo from 'components/images/CoinLogo';
|
||||
import * as stateUtils from 'reducers/utils';
|
||||
import Link from 'components/Link';
|
||||
import { FONT_WEIGHT, FONT_SIZE } from 'config/variables';
|
||||
import AccountBalance from './components/Balance';
|
||||
import AddedToken from './components/Token';
|
||||
|
||||
@ -38,9 +39,16 @@ const StyledTooltip = styled(Tooltip)`
|
||||
|
||||
const AccountName = styled.div`
|
||||
display: flex;
|
||||
justify-content: center;
|
||||
align-items: center;
|
||||
`;
|
||||
|
||||
const AccountTitle = styled.div`
|
||||
font-size: ${FONT_SIZE.WALLET_TITLE};
|
||||
font-weight: ${FONT_WEIGHT.BASE};
|
||||
color: ${colors.WALLET_TITLE};
|
||||
`;
|
||||
|
||||
const StyledCoinLogo = styled(CoinLogo)`
|
||||
margin-right: 10px;
|
||||
`;
|
||||
@ -82,7 +90,7 @@ const AccountSummary = (props: Props) => {
|
||||
<AccountHeading>
|
||||
<AccountName>
|
||||
<StyledCoinLogo network={account.network} />
|
||||
<H2>Account #{parseInt(account.index, 10) + 1}</H2>
|
||||
<AccountTitle>Account #{parseInt(account.index, 10) + 1}</AccountTitle>
|
||||
</AccountName>
|
||||
<Link href={explorerLink} isGray>See full transaction history</Link>
|
||||
</AccountHeading>
|
||||
|
||||
@ -10211,9 +10211,9 @@ tr46@^1.0.1:
|
||||
dependencies:
|
||||
punycode "^2.1.0"
|
||||
|
||||
trezor-connect@^5.0.32:
|
||||
version "5.0.32"
|
||||
resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-5.0.32.tgz#a8077f46653fec16d8dc25358e157ed1048a4def"
|
||||
trezor-connect@6.0.0:
|
||||
version "6.0.0"
|
||||
resolved "https://registry.yarnpkg.com/trezor-connect/-/trezor-connect-6.0.0.tgz#2a45336f29a4a3f2a8ad2d121363b0e7a1b767ef"
|
||||
dependencies:
|
||||
babel-runtime "^6.26.0"
|
||||
events "^1.1.1"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user