Merge branch 'master' of github.com:gnosis/safe-react into development

This commit is contained in:
Mikhail Mikheev 2020-03-11 16:49:33 +04:00
commit 97343670f6
4 changed files with 723 additions and 190 deletions

View File

@ -2,11 +2,7 @@
export NODE_ENV=production; export NODE_ENV=production;
if [[ -n "$TRAVIS_TAG" ]]; then if [[ -n "$TRAVIS_TAG" ]]; then export REACT_APP_ENV='production'; fi
export REACT_APP_ENV='production';
elif [[ "$TRAVIS_BRANCH" == "development" ]]; then
export NODE_ENV=development;
fi
yarn lint:check yarn lint:check
yarn prettier:check yarn prettier:check

View File

@ -7,5 +7,5 @@ const proxyCodeV10 =
const oldProxyCode = const oldProxyCode =
'0x60806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634555d5c91461008b5780635c60da1b146100b6575b73ffffffffffffffffffffffffffffffffffffffff600054163660008037600080366000845af43d6000803e6000811415610086573d6000fd5b3d6000f35b34801561009757600080fd5b506100a061010d565b6040518082815260200191505060405180910390f35b3480156100c257600080fd5b506100cb610116565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60006002905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050905600' '0x60806040526004361061004c576000357c0100000000000000000000000000000000000000000000000000000000900463ffffffff1680634555d5c91461008b5780635c60da1b146100b6575b73ffffffffffffffffffffffffffffffffffffffff600054163660008037600080366000845af43d6000803e6000811415610086573d6000fd5b3d6000f35b34801561009757600080fd5b506100a061010d565b6040518082815260200191505060405180910390f35b3480156100c257600080fd5b506100cb610116565b604051808273ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200191505060405180910390f35b60006002905090565b60008060009054906101000a900473ffffffffffffffffffffffffffffffffffffffff169050905600'
export const isProxyCode = codeToCheck => export const isProxyCode = (codeToCheck: string) =>
codeToCheck === oldProxyCode || codeToCheck === proxyCodeV10 codeToCheck === oldProxyCode || codeToCheck === proxyCodeV10

View File

@ -7,7 +7,14 @@ import { type Confirmation } from '~/routes/safe/store/models/confirmation'
export const OUTGOING_TX_TYPE = 'outgoing' export const OUTGOING_TX_TYPE = 'outgoing'
export type TransactionType = 'incoming' | 'outgoing' | 'settings' | 'custom' | 'creation' | 'cancellation' export type TransactionType =
| 'incoming'
| 'outgoing'
| 'settings'
| 'custom'
| 'creation'
| 'cancellation'
| 'third-party-app'
export type TransactionStatus = export type TransactionStatus =
| 'awaiting_your_confirmation' | 'awaiting_your_confirmation'

896
yarn.lock

File diff suppressed because it is too large Load Diff