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

config/travis/build.sh

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

src/logic/contracts/historicProxyCode.js

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

src/routes/safe/store/models/transaction.js

@@ -7,7 +7,14 @@ import { type Confirmation } from '~/routes/safe/store/models/confirmation'
 
 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 =
   | 'awaiting_your_confirmation'