arno/trezor-wallet
1
0
Fork 0
mirror of https://github.com/trezor/trezor-wallet synced 2024-12-30 19:00:53 +00:00
Code Issues Releases Wiki Activity

merge 2

Browse Source
This commit is contained in:
Vladimir Volek 2018-11-22 15:19:44 +01:00
parent 851c7f23cb
commit e9a60afa0f
2 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/reducers/SelectedAccountReducer.js
View File

@ -42,14 +42,11 @@ export const initialState: State = {
title: null, title: null,
message: null, message: null,
}, },
<<<<<<< HEAD
=======
loader: { loader: {
type: null, type: null,
title: null, title: null,
message: null, message: null,
}, },
>>>>>>> master
shouldRender: false, shouldRender: false,
}; };

4
src/views/Wallet/views/Account/Send/index.js
View File

@ -185,11 +185,7 @@ const AccountSend = (props: Props) => {
discovery, discovery,
tokens, tokens,
shouldRender, shouldRender,
<<<<<<< HEAD
notification,
=======
loader, loader,
>>>>>>> master
} = props.selectedAccount; } = props.selectedAccount;
const { const {
address, address,