Layout for "Manage starnames/iovnames/names" views

package.json

@@ -43,12 +43,13 @@
   },
   "devDependencies": {
     "@babel/core": "^7.3.4",
-    "@storybook/addon-actions": "^5.2.1",
-    "@storybook/addon-links": "^5.2.1",
-    "@storybook/addon-storyshots": "^5.2.1",
-    "@storybook/addon-viewport": "^5.2.1",
-    "@storybook/addons": "^5.2.1",
-    "@storybook/react": "^5.2.1",
+    "@storybook/addon-actions": "^5.3.17",
+    "@storybook/addon-links": "^5.3.17",
+    "@storybook/addon-storyshots": "^5.3.17",
+    "@storybook/addon-viewport": "^5.3.17",
+    "@storybook/addons": "^5.3.17",
+    "@storybook/preset-create-react-app": "^2.0.0",
+    "@storybook/react": "^5.3.17",
     "@types/chrome": "^0.0.82",
     "@types/classnames": "^2.2.7",
     "@types/jest": "24.0.14",
@@ -57,11 +58,8 @@
     "@types/react": "16.8.19",
     "@types/react-dom": "16.8.4",
     "@types/react-redux": "7.1.0",
-    "@types/react-test-renderer": "^16.8.1",
-    "@types/storybook__addon-actions": "^3.4.3",
-    "@types/storybook__addon-storyshots": "^5.1.1",
-    "@types/storybook__addon-viewport": "^4.1.1",
-    "@types/storybook__react": "^4.0.2",
+    "@types/react-test-renderer": "^16.9.2",
+    "@types/puppeteer": "^1.13.0",
     "eslint": "^6",
     "eslint-config-prettier": "^6.2.0",
     "eslint-plugin-prettier": "^3.0.1",

packages/bierzo-wallet/package.json

@@ -65,6 +65,7 @@
   },
   "browserslist": [
     ">0.2%",
+    "chrome 45",
     "not dead",
     "not ie <= 11",
     "not op_mini all"

packages/bierzo-wallet/src/communication/requestgenerators.ts

@@ -108,7 +108,7 @@ export const generateRegisterDomainTxWithFee = async (
   domain: string,
 ): Promise<RegisterDomainTx> => {
   const creatorAddress = bnsCodec.identityToAddress(creator);
-  const TwoHoursInSeconds = 2 * 3600;
+  const TwoHoursInSeconds = 2 * 3600; // FIXME: I think we need to change this before release.
 
   const regDomainTx: RegisterDomainTx = {
     kind: "bns/register_domain",

packages/bierzo-wallet/src/routes/register/components/SelectAddressesTable.tsx → packages/bierzo-wallet/src/components/AccountEdit/SelectAddressesTable.tsx

@@ -14,7 +14,7 @@ import {
 import React from "react";
 import { randomString } from "ui-logic";
 
-import { ChainAddressPairWithName } from "../../../components/AddressesTable";
+import { ChainAddressPairWithName } from "../AddressesTable";
 
 export const addressValueField = "address-value-field";
 export const blockchainValueField = "blockchain-value-field";

packages/bierzo-wallet/src/components/AccountEdit/index.stories.tsx

@@ -0,0 +1,64 @@
+import { Address, ChainId, Fee, Token, TokenTicker } from "@iov/bcp";
+import { action } from "@storybook/addon-actions";
+import { linkTo } from "@storybook/addon-links";
+import { storiesOf } from "@storybook/react";
+import React from "react";
+import { stringToAmount } from "ui-logic";
+
+import AccountEdit from "../../components/AccountEdit";
+import {
+  ACCOUNT_MANAGE_SAMPLE_STORY_PATH,
+  ACCOUNT_MANAGE_STORY_PATH,
+} from "../../components/AccountManage/index.stories";
+import { ChainAddressPairWithName } from "../../components/AddressesTable";
+import DecoratedStorybook, { bierzoRoot } from "../../utils/storybook";
+import { BwUsernameWithChainName } from "../AccountManage";
+
+const addresses: ChainAddressPairWithName[] = [
+  {
+    chainId: "local-iov-devnet" as ChainId,
+    address: "tiov1dcg3fat5zrvw00xezzjk3jgedm7pg70y222af3" as Address,
+    chainName: "IOV Devnet",
+  },
+  {
+    chainId: "lisk-198f2b61a8" as ChainId,
+    address: "1349293588603668134L" as Address,
+    chainName: "Lisk Devnet",
+  },
+  {
+    chainId: "ethereum-eip155-5777" as ChainId,
+    address: "0xD383382350F9f190Bd2608D6381B15b4e1cec0f3" as Address,
+    chainName: "Ganache",
+  },
+];
+
+const iov: Pick<Token, "tokenTicker" | "fractionalDigits"> = {
+  fractionalDigits: 9,
+  tokenTicker: "IOV" as TokenTicker,
+};
+
+const fee: Fee = {
+  tokens: stringToAmount("5", iov),
+};
+
+const account: BwUsernameWithChainName = {
+  username: "test*iov",
+  addresses: addresses,
+};
+
+export const UPDATE_ACCOUNT_STORY_PATH = `${bierzoRoot}/Update Account`;
+export const UPDATE_ACCOUNT_SAMPLE_STORY_PATH = "Update sample";
+
+storiesOf(UPDATE_ACCOUNT_STORY_PATH, module)
+  .addParameters({ viewport: { defaultViewport: "responsive" } })
+  .add(UPDATE_ACCOUNT_SAMPLE_STORY_PATH, () => (
+    <DecoratedStorybook>
+      <AccountEdit
+        chainAddresses={addresses}
+        account={account}
+        onCancel={linkTo(ACCOUNT_MANAGE_STORY_PATH, ACCOUNT_MANAGE_SAMPLE_STORY_PATH)}
+        transactionFee={fee}
+        onSubmit={async (values: object): Promise<void> => action("Account update submit")(values)}
+      />
+    </DecoratedStorybook>
+  ));

packages/bierzo-wallet/src/components/AccountEdit/index.tsx

@@ -0,0 +1,274 @@
+import { Address, Fee } from "@iov/bcp";
+import clipboardCopy from "clipboard-copy";
+import {
+  Back,
+  Block,
+  Button,
+  Form,
+  FormValues,
+  Hairline,
+  Image,
+  makeStyles,
+  ToastContext,
+  ToastVariant,
+  Tooltip,
+  Typography,
+  useForm,
+} from "medulas-react-components";
+import React from "react";
+import { amountToString } from "ui-logic";
+
+import { isIovname } from "../../logic/account";
+import {
+  AddressesTooltipHeader,
+  BwAccountWithChainName,
+  BwUsernameWithChainName,
+  isAccountData,
+  TooltipContent,
+} from "../AccountManage";
+import { AddressesTableProps, ChainAddressPairWithName } from "../AddressesTable";
+import copy from "../AddressesTable/assets/copy.svg";
+import PageContent from "../PageContent";
+import shield from "./assets/shield.svg";
+import SelectAddressesTable, {
+  addressValueField,
+  blockchainValueField,
+  getAddressInputName,
+  getBlockchainInputName,
+  SelectAddressItem,
+} from "./SelectAddressesTable";
+
+export const EDIT_ACCOUNT_VIEW_ID = "edit-account-view-id";
+export const EDIT_ACCOUNT_FIELD = "edit-account-field";
+
+export function getChainAddressPairsFromValues(
+  values: FormValues,
+  addresses: readonly ChainAddressPairWithName[],
+): readonly ChainAddressPairWithName[] {
+  const chainAddressMap: Map<string, Partial<ChainAddressPairWithName>> = new Map<
+    string,
+    Partial<ChainAddressPairWithName>
+  >();
+  Object.keys(values).forEach(key => {
+    const idxLenght = key.indexOf("-");
+    if (idxLenght === -1) return;
+
+    const index = key.substr(0, idxLenght);
+    let pair = chainAddressMap.get(index);
+    if (!pair) {
+      pair = {};
+    }
+
+    const type = key.substr(idxLenght + 1);
+    switch (type) {
+      case addressValueField: {
+        pair = { ...pair, address: values[key] as Address };
+        break;
+      }
+      case blockchainValueField: {
+        const chain = addresses.find(address => address.chainName === values[key]);
+        if (chain) {
+          pair = { ...pair, chainId: chain.chainId, chainName: chain.chainName };
+        }
+        break;
+      }
+    }
+
+    chainAddressMap.set(index, pair);
+  });
+
+  const chainAddressPair: ChainAddressPairWithName[] = [];
+  chainAddressMap.forEach(value => {
+    if (value.address && value.chainId && value.chainName) {
+      chainAddressPair.push({
+        address: value.address,
+        chainId: value.chainId,
+        chainName: value.chainName,
+      });
+    }
+  });
+
+  return chainAddressPair;
+}
+
+export function getSubmitButtonCaption(fee: Fee | undefined): string {
+  if (fee && fee.tokens) {
+    return `Register for ${amountToString(fee.tokens)}`;
+  }
+
+  return "Register";
+}
+
+export function getFormInitValues(addressItems: SelectAddressItem[]): FormValues {
+  const initialValues: FormValues = {};
+  addressItems.forEach(item => {
+    initialValues[getAddressInputName(item.id)] = item.chain.address;
+    initialValues[getBlockchainInputName(item.id)] = item.chain.chainName;
+  });
+
+  return initialValues;
+}
+
+export function getAddressItems(chainAddresses: readonly ChainAddressPairWithName[]): SelectAddressItem[] {
+  const addressItems: SelectAddressItem[] = [];
+  chainAddresses.forEach((chain, index) => {
+    if (chain.address) {
+      addressItems.push({
+        id: index.toString(),
+        chain,
+      });
+    }
+  });
+
+  return addressItems;
+}
+
+const registerIcon = <Image src={shield} alt="shield" />;
+
+const useStyles = makeStyles({
+  iovnameHeader: {
+    boxShadow: "0px 0px 14px #EDEFF4",
+  },
+  link: {
+    cursor: "pointer",
+  },
+});
+
+export function NoIovnameHeader(): JSX.Element {
+  const classes = useStyles();
+  return (
+    <Block className={classes.iovnameHeader} borderRadius={40} width={145} padding={1}>
+      <Typography variant="subtitle1" weight="semibold" color="primary" align="center">
+        yourname*iov
+      </Typography>
+    </Block>
+  );
+}
+
+export interface AccountEditProps extends AddressesTableProps {
+  readonly onCancel: () => void;
+  readonly account: BwUsernameWithChainName | BwAccountWithChainName;
+  readonly transactionFee: Fee | undefined;
+}
+
+interface Props extends AccountEditProps {
+  readonly onSubmit: (values: object) => Promise<void>;
+}
+
+const AccountEdit = ({ chainAddresses, account, onCancel, transactionFee, onSubmit }: Props): JSX.Element => {
+  const classes = useStyles();
+  const toast = React.useContext(ToastContext);
+
+  const chainAddressesItems = React.useMemo(() => {
+    return getAddressItems(account.addresses);
+  }, [account]);
+
+  const initialValues = React.useMemo(() => getFormInitValues(chainAddressesItems), [chainAddressesItems]);
+  const { form, handleSubmit, invalid, submitting, validating } = useForm({
+    onSubmit,
+    initialValues,
+  });
+
+  const onAccountCopy = (): void => {
+    if (account) {
+      const name = isAccountData(account) ? account.name : account.username;
+      clipboardCopy(name);
+      toast.show("Account has been copied to clipboard.", ToastVariant.INFO);
+    }
+  };
+
+  const buttons = (
+    <Block
+      marginTop={4}
+      marginBottom={1}
+      justifyContent="center"
+      display="flex"
+      alignItems="center"
+      flexDirection="column"
+    >
+      <Block width="75%">
+        <Button
+          fullWidth
+          type="submit"
+          disabled={invalid || submitting || validating}
+          spinner={submitting || validating}
+        >
+          {getSubmitButtonCaption(transactionFee)}
+        </Button>
+      </Block>
+      <Block width="75%" marginTop={1}>
+        <Back fullWidth disabled={submitting} onClick={onCancel}>
+          Cancel
+        </Back>
+      </Block>
+    </Block>
+  );
+
+  return (
+    <Form onSubmit={handleSubmit}>
+      <PageContent id={EDIT_ACCOUNT_VIEW_ID} icon={registerIcon} buttons={buttons} avatarColor="#31E6C9">
+        <Block textAlign="left">
+          <Block display="flex" justifyContent="center">
+            <Typography variant="h4" align="center">
+              {isAccountData(account) ? `${account.name}*${account.domain}` : account.username}
+            </Typography>
+            <Block marginRight={2} />
+            <Block onClick={onAccountCopy} className={classes.link} marginTop={1}>
+              <Image src={copy} alt="Copy" width={20} />
+            </Block>
+          </Block>
+          {isAccountData(account) && (
+            <Block display="flex" justifyContent="center" marginTop={1}>
+              {isIovname(`${account.name}*${account.domain}`) || !account.name ? (
+                <Typography variant="body2" inline align="center" color="textSecondary">
+                  Expires on {account.expiryDate.toLocaleDateString()}
+                </Typography>
+              ) : (
+                <React.Fragment>
+                  <Typography variant="body2" inline align="center" color="textSecondary">
+                    Name assigned to you by
+                  </Typography>
+                  <Typography variant="body2" weight="semibold" inline align="center" color="textSecondary">
+                    {` *${account.domain}`}
+                  </Typography>
+                </React.Fragment>
+              )}
+            </Block>
+          )}
+
+          <Block width="100%" marginTop={3} marginBottom={1}>
+            <Block display="flex" alignItems="center" marginBottom={1}>
+              <Block width={440}>
+                <Typography variant="body2" weight="semibold" inline>
+                  CHOOSE LINKED ADDRESSES
+                </Typography>
+              </Block>
+              <Block marginRight={1} />
+              <Block width={34}>
+                <Tooltip maxWidth={320}>
+                  <TooltipContent header={<AddressesTooltipHeader />} title="Your linked addresses">
+                    With Neuma you can have an universal blockchain address that is linked to all your
+                    addresses. Just give your friends your iovname.
+                  </TooltipContent>
+                </Tooltip>
+              </Block>
+              <Block width="100%" marginLeft={1} marginRight={1}>
+                <Hairline />
+              </Block>
+              <Typography variant="subtitle2" inline weight="regular">
+                Optional
+              </Typography>
+            </Block>
+            <SelectAddressesTable
+              availableBlockchains={chainAddresses}
+              chainAddressesItems={chainAddressesItems}
+              form={form}
+            />
+          </Block>
+        </Block>
+      </PageContent>
+    </Form>
+  );
+};
+
+export default AccountEdit;