Commit Graph

9354 Commits

Author SHA1 Message Date
Victor Baranov 07b1695df9
Merge branch 'develop' into multiple-hardware 2018-12-28 15:34:50 +03:00
Victor Baranov 798256fb7f
Merge pull request #238 from poanetwork/change-to-contract-acc-after-execution
(Fix) Unlock back contract account on rejecting/accepting of contract execution transaction
2018-12-28 15:28:08 +03:00
Victor Baranov 56759f28e8 Open accounts page despite HD is not connected 2018-12-28 14:13:12 +03:00
Victor Baranov f6081edbc8 Merge branch 'multiple-hardware' of github.com:poanetwork/nifty-wallet into multiple-hardware 2018-12-28 13:39:10 +03:00
Victor Baranov 83b90b775d Remove selection of currently unlocked HD account in HD accounts list by default 2018-12-28 13:37:59 +03:00
Victor Baranov 957bdcf7cc
Merge pull request #243 from dennis00010011b/e2e-hd
e2e connect hd wallet
2018-12-27 21:49:22 +03:00
Victor Baranov 204865b80b Unlock ledger HD account on changing account in dropdown list 2018-12-27 21:39:41 +03:00
dennistikhomirov 1b8a0426f8 e2e: sun package-lock 2018-12-27 08:45:20 -08:00
dennistikhomirov 5957da4c8e e2e: update package-lock 2018-12-27 08:22:33 -08:00
dennistikhomirov 609149e5f6 e2e: tests for hd wallet 2018-12-27 08:11:28 -08:00
Victor Baranov e8b90676e1 merge with develop branch 2018-12-27 13:20:02 +03:00
Victor Baranov 90bac9e29b merge with develop branch 2018-12-27 13:17:40 +03:00
Victor Baranov 5a87cfebb2 merge with develop branch 2018-12-27 13:16:28 +03:00
Victor Baranov 606a519202
Merge pull request #242 from dennis00010011b/e2e-owners-first
e2e contract-executor-reorder
2018-12-27 13:02:34 +03:00
Victor Baranov 693024d2f4
Merge pull request #241 from poanetwork/downgrade-hd-packages
(Fix) Downgrade HD related packages versions for release
2018-12-27 13:00:42 +03:00
dennistikhomirov cf9b333561 e2e: check order in executor list 2018-12-27 01:26:11 -08:00
dennistikhomirov 418efd3ccc e2e:merge with PR#238-unlock back contract account 2018-12-26 23:44:02 -08:00
Victor Baranov 3d529d8932 Downgrade eth-ledger-bridge-keyring eth-trezor-keyring packages for release 2018-12-26 22:39:35 +03:00
Victor Baranov 31a5f7d8e4 check checkbox for selected account 2018-12-26 19:21:56 +03:00
Victor Baranov 291089de42 empty owners var fix 2018-12-26 18:23:18 +03:00
Victor Baranov b95904687d eslinter fix 2018-12-26 18:04:25 +03:00
Victor Baranov 4b0c8456d2 Fix for Ledger Live option 2018-12-26 17:54:32 +03:00
Victor Baranov e0f8a269f7 Merge branch 'change-to-contract-acc-after-execution' of github.com:poanetwork/nifty-wallet into change-to-contract-acc-after-execution 2018-12-26 16:14:03 +03:00
Victor Baranov 2b1e7fdbdf Merge remote-tracking branch 'origin/develop' into change-to-contract-acc-after-execution 2018-12-26 16:13:34 +03:00
Victor Baranov 1314294b1c Merge remote-tracking branch 'origin/develop' into contract-executors-reorder 2018-12-26 16:12:48 +03:00
Victor Baranov b81fe64308
Merge pull request #240 from dennis00010011b/e2e-contract-back
e2e for change-to-contract-acc-after-execution
2018-12-26 16:11:16 +03:00
Victor Baranov 67466deb02
Merge pull request #229 from poanetwork/bool-select
(Feature) Select input for Boolean type for contract type acc
2018-12-26 16:09:57 +03:00
Victor Baranov a44824a8b6 Merge remote-tracking branch 'origin/develop' into contract-executors-reorder 2018-12-26 15:54:04 +03:00
Victor Baranov 3df13417bb
Merge branch 'change-to-contract-acc-after-execution' into e2e-contract-back 2018-12-26 15:53:06 +03:00
Victor Baranov 7ef163b741 Merge remote-tracking branch 'origin/develop' into change-to-contract-acc-after-execution 2018-12-26 15:50:54 +03:00
Victor Baranov 42936f204e
Merge pull request #233 from poanetwork/copy-abi
(Feature) Copy contract ABI from menu
2018-12-26 15:43:56 +03:00
Victor Baranov 887b45df0c
Merge branch 'develop' into copy-abi 2018-12-26 15:18:28 +03:00
Victor Baranov 42f2af1711
Merge branch 'develop' into bool-select 2018-12-26 15:17:35 +03:00
Victor Baranov dca7c49f34
Merge pull request #232 from poanetwork/execute-button
(Fix) Execute methods button
2018-12-26 15:16:16 +03:00
dennistikhomirov 386dc14bae e2e:improve stability#2 2018-12-26 02:14:37 -08:00
dennistikhomirov b613c3fa47 e2e:improve stability 2018-12-26 02:01:17 -08:00
dennistikhomirov a5ad1c6ff6 e2e:improve stability 2018-12-26 02:00:50 -08:00
dennistikhomirov aa4a1fcc2a e2e:check buttons name 2018-12-26 01:39:56 -08:00
dennistikhomirov 617bbafcd8 e2e: fix name of tests 2018-12-26 01:12:53 -08:00
dennistikhomirov feeaf068b1 e2e: execute method button submit buy ether 2018-12-26 00:54:33 -08:00
dennistikhomirov 68f979cfb0 e2e: test button reject all, submit 2018-12-25 11:57:36 -08:00
Victor Baranov f3dd598110 eslinter, unit tests fixes 2018-12-25 19:33:58 +03:00
dennistikhomirov 9def952d3c e2e: test button reject 2018-12-25 08:18:48 -08:00
Victor Baranov 5d74c1765c Reorder method executors: owners are first 2018-12-25 18:49:26 +03:00
dennistikhomirov 9890bcb32a e2e: sync with upstream 2018-12-25 05:28:47 -08:00
Victor Baranov d3aec77925 add isContractExecutionByUser to prop types validation 2018-12-25 16:07:31 +03:00
Victor Baranov c781aa08fa Update eth-ledger-bridge-keyring dep with a new bridge link 2018-12-25 15:56:05 +03:00
dennistikhomirov e09aa87292 e2e:merge with execute-button 2018-12-25 04:01:47 -08:00
Victor Baranov d66b6ab643 package-lock.json 2018-12-25 14:07:30 +03:00
Victor Baranov 68860bea93 Apply multiple accounts support changes 2018-12-25 00:47:19 +03:00