Skip to content
This repository has been archived by the owner on Nov 6, 2020. It is now read-only.

Commit

Permalink
UI backports (#6332)
Browse files Browse the repository at this point in the history
* Time should not contribue to overall status. (#6276)

* Add warning to web browser and fix links. (#6232)

* Extension fixes (#6284)

* Fix token symbols in extension.

* Allow connections from firefox extension.

* Add support for ConsenSys multisig wallet (#6153)

* First draft of ConsenSys wallet

* Fix transfer store // WIP Consensys Wallet

* Rename walletABI JSON file

* Fix linting

* Fix wrong daylimit in wallet modal

* Confirm/Revoke ConsensysWallet txs

* Linting

* Change of settings for the Multisig Wallet
  • Loading branch information
ngotchac authored and arkpar committed Aug 18, 2017
1 parent fcc3887 commit b0f89be
Show file tree
Hide file tree
Showing 25 changed files with 1,888 additions and 789 deletions.
510 changes: 510 additions & 0 deletions js/src/contracts/abi/consensys-multisig-wallet.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion js/src/contracts/abi/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -28,4 +28,4 @@ export registry2 from './registry2.json';
export signaturereg from './signaturereg.json';
export smsverification from './sms-verification.json';
export tokenreg from './tokenreg.json';
export wallet from './wallet.json';
export foundationWallet from './foundation-multisig-wallet.json';
11 changes: 8 additions & 3 deletions js/src/embed.js
Original file line number Diff line number Diff line change
Expand Up @@ -64,14 +64,19 @@ class FakeTransport {

class FrameSecureApi extends SecureApi {
constructor (transport) {
super(transport.uiUrl, null, () => {
return transport;
});
super(
transport.uiUrl,
null,
() => transport,
() => 'http:'
);
}

connect () {
// Do nothing - this API does not need connecting
this.emit('connecting');
// Fetch settings
this._fetchSettings();
// Fire connected event with some delay.
setTimeout(() => {
this.emit('connected');
Expand Down
4 changes: 2 additions & 2 deletions js/src/modals/AddContract/types.js
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import React from 'react';
import { FormattedMessage } from 'react-intl';

import { eip20, wallet } from '~/contracts/abi';
import { eip20, foundationWallet } from '~/contracts/abi';

const ABI_TYPES = [
{
Expand Down Expand Up @@ -72,7 +72,7 @@ const ABI_TYPES = [
),
readOnly: true,
type: 'multisig',
value: JSON.stringify(wallet)
value: JSON.stringify(foundationWallet)
},
{
description: (
Expand Down
6 changes: 3 additions & 3 deletions js/src/modals/CreateWallet/createWalletStore.js
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ import { FormattedMessage } from 'react-intl';

import Contract from '~/api/contract';
import Contracts from '~/contracts';
import { wallet as walletAbi } from '~/contracts/abi';
import { foundationWallet as walletAbi } from '~/contracts/abi';
import { wallet as walletCode, walletLibrary as walletLibraryCode, walletLibraryRegKey, fullWalletCode } from '~/contracts/code/wallet';

import { validateUint, validateAddress, validateName } from '~/util/validation';
Expand Down Expand Up @@ -163,11 +163,11 @@ export default class CreateWalletStore {
WalletsUtils.fetchOwners(walletContract),
WalletsUtils.fetchDailylimit(walletContract)
])
.then(([ require, owners, dailylimit ]) => {
.then(([ require, owners, daylimit ]) => {
transaction(() => {
this.wallet.owners = owners;
this.wallet.required = require.toNumber();
this.wallet.dailylimit = dailylimit.limit;
this.wallet.daylimit = daylimit.limit;

this.wallet = this.getWalletWithMeta(this.wallet);
});
Expand Down
Loading

0 comments on commit b0f89be

Please sign in to comment.