Skip to content

Commit

Permalink
fix: polish the wallet and dApp UIs
Browse files Browse the repository at this point in the history
  • Loading branch information
michaelfig committed Mar 4, 2020
1 parent 6dd0ca3 commit 292291f
Show file tree
Hide file tree
Showing 5 changed files with 11,135 additions and 9 deletions.
4 changes: 2 additions & 2 deletions packages/agoric-cli/lib/start.js
Original file line number Diff line number Diff line change
Expand Up @@ -32,11 +32,11 @@ export default async function startMain(progname, rawArgs, priv, opts) {

const linkHtml = async name => {
console.log(chalk.green('linking html directories'));
const dappHtml = `.agservers/${name}/dapp-html`;
// const dappHtml = `.agservers/${name}/dapp-html`;
const htmlWallet = `.agservers/${name}/html/wallet`;
// await Promise.all([fs.unlink(dappHtml).catch(() => {}), fs.unlink(htmlWallet).catch(() => {})]);
await Promise.all([
fs.symlink('../../ui/build', dappHtml).catch(() => {}),
// fs.symlink('../../ui/build', dappHtml).catch(() => {}),
fs.symlink('../../../.agwallet', htmlWallet).catch(() => {}),
]);
};
Expand Down
2 changes: 1 addition & 1 deletion packages/cosmic-swingset/lib/ag-solo/vats/bootstrap.js
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ export default function setup(syscall, state, helpers) {
const uploads = E(vats.uploads).getUploads();

// Wallet for both end-user client and dapp dev client
E(vats.wallet).startup(zoe, registrar);
await E(vats.wallet).startup(zoe, registrar);
const wallet = E(vats.wallet).getWallet();
await Promise.all(
assayInfo.map(({ petname, regKey, assay }) =>
Expand Down
10 changes: 5 additions & 5 deletions packages/dapp-simple-exchange/.agservers/.gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -76,8 +76,8 @@ integration-test/transform-tests/output
# generated Sphinx/ReadTheDocs files
/docs/build/

/solo
/dev
/testnet
/chain
/ve*
solo
dev
testnet
chain
ve*
5 changes: 4 additions & 1 deletion packages/wallet-frontend/src/components/Web3Status.jsx
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import React from 'react';
import React, { useEffect } from 'react';

import { makeStyles } from '@material-ui/core/styles';
import { Button, Chip } from '@material-ui/core';
Expand All @@ -18,6 +18,9 @@ export default function Web3Status() {
const { state, dispatch } = useApplicationContext();
const { active, connected, account } = state;

// By default, be connected.
useEffect(() => dispatch(activateConnection()), [dispatch]);

function handleConnect() {
dispatch(activateConnection());
}
Expand Down
Loading

0 comments on commit 292291f

Please sign in to comment.