Skip to content
This repository has been archived by the owner on Mar 23, 2023. It is now read-only.

refactor: registration select address #2476

Merged
merged 4 commits into from
Jul 15, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ export const SelectAddress = React.forwardRef<HTMLInputElement, SelectAddressPro
<SelectAddressWrapper
data-testid="SelectAddress__wrapper"
className={`SelectAddress ${disabled ? "is-disabled" : ""} ${isInvalidField ? "is-invalid" : ""}`}
type="button"
onClick={openContacts}
>
<ProfileAvatar address={selectedAddress} />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ exports[`SelectAddress should render disabled 1`] = `
<button
class="sc-fznZeY jUYMgc SelectAddress is-disabled "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-AxirZ HSPq mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -41,6 +42,7 @@ exports[`SelectAddress should render empty 1`] = `
<button
class="sc-fznZeY jUYMgc SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-AxirZ HSPq mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -76,6 +78,7 @@ exports[`SelectAddress should render invalid 1`] = `
<button
class="sc-fznZeY jUYMgc SelectAddress is-invalid"
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-AxirZ HSPq mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -112,6 +115,7 @@ exports[`SelectAddress should render with preselected address 1`] = `
<button
class="sc-fznZeY jUYMgc SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="Avatar__AvatarWrapper-sc-1vsy2s2-0 laNXvc mx-3"
Expand Down Expand Up @@ -168,6 +172,7 @@ exports[`SelectAddress should render with preselected verified address 1`] = `
<button
class="sc-fznZeY jUYMgc SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-AxirZ HSPq mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,7 @@ exports[`AddRecipient should render 1`] = `
<button
class="sc-fzokOt dprUuD SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -222,6 +223,7 @@ exports[`AddRecipient should render with multiple recipients tab 1`] = `
<button
class="sc-fzokOt dprUuD SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -368,6 +370,7 @@ exports[`AddRecipient should render without recipients 1`] = `
<button
class="sc-fzokOt dprUuD SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -514,6 +517,7 @@ exports[`AddRecipient should set available amount 1`] = `
<button
class="sc-fzokOt dprUuD SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -206,6 +206,7 @@ exports[`SendTransactionForm should not call onBack callback if not provided 1`]
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -312,6 +313,7 @@ exports[`SendTransactionForm should not call onBack callback if not provided 1`]
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -748,6 +750,7 @@ exports[`SendTransactionForm should not call onSubmit callback if not provided 1
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -854,6 +857,7 @@ exports[`SendTransactionForm should not call onSubmit callback if not provided 1
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -1290,6 +1294,7 @@ exports[`SendTransactionForm should render 1`] = `
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -1396,6 +1401,7 @@ exports[`SendTransactionForm should render 1`] = `
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -1724,6 +1730,7 @@ exports[`SendTransactionForm should set available amount 1`] = `
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down Expand Up @@ -1830,6 +1837,7 @@ exports[`SendTransactionForm should set available amount 1`] = `
<button
class="sc-fzqBZW iKvOTi SelectAddress "
data-testid="SelectAddress__wrapper"
type="button"
>
<div
class="sc-fzplWN exzsOf mx-3 bg-theme-neutral-200 border-theme-neutral-200"
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { contacts } from "domains/contact/data";
import React from "react";

import { networks } from "../../data";
Expand Down Expand Up @@ -25,6 +26,7 @@ const defaultFormValues = {
formatted: "My Wallet FJKDSALJFKASL...SAJFKLASJKDFJ",
},
],
profiles: contacts,
};

export const Default = () => <Registration {...defaultFormValues} onDownload={() => alert("download")} />;
49 changes: 22 additions & 27 deletions src/domains/transaction/pages/Registration/Registration.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import { TabPanel, Tabs } from "app/components/Tabs";
import { TextArea } from "app/components/TextArea";
import { TransactionDetail } from "app/components/TransactionDetail";
import { useActiveProfile } from "app/hooks/env";
import { ProfileFormField } from "domains/profile/components/ProfileFormField";
import { SelectAddress } from "domains/profile/components/SelectAddress";
import { InputFee } from "domains/transaction/components/InputFee";
import { LedgerConfirmation } from "domains/transaction/components/LedgerConfirmation";
import { LinkCollection } from "domains/transaction/components/LinkCollection";
Expand All @@ -30,11 +30,11 @@ import { styled } from "twin.macro";
import { networks } from "../../data";

type RegistrationProps = {
addresses?: any;
formDefaultData?: any;
onDownload?: any;
networks?: any;
registrationTypes?: any;
profiles: any[];
};

type Network = { name: string; label: string; value: string; icon: string; iconClass: string };
Expand Down Expand Up @@ -71,24 +71,20 @@ const RegistrationTypeDropdown = ({ className, register, registrationTypes }: an
);
};

const getAddressInfo = (addresses: any[], address: string) => {
return addresses.find((profile: any) => profile.address === address);
};

const getRegistrationByName = (registrationTypes: any[], registrationType: string) => {
return registrationTypes.find((type: any) => type.value === registrationType);
};

const FirstStep = ({
addresses,
form,
networks,
registrationTypes,
profiles,
}: {
addresses: any;
form: any;
networks: Network[];
registrationTypes: RegistrationType[];
profiles: any[];
}) => {
const { register } = form;
const { address, registrationType } = form.watch();
Expand All @@ -106,15 +102,21 @@ const FirstStep = ({
<SelectNetwork networks={networks} />
</FormField>

<ProfileFormField
formName="address"
formLabel="Address"
profiles={addresses}
selectedProfile={getAddressInfo(addresses, address)}
register={register}
withoutAdditional={true}
className="mt-8"
/>
<FormField name="address" className="relative mt-8">
<div className="mb-2">
<FormLabel label="Address" />
</div>

<div data-testid="Registration__address-field">
<SelectAddress
contactSearchTitle="My addresses"
contactSearchDescription="Find and select preferred address from you saved profiles"
address={address}
ref={register}
contacts={profiles}
/>
</div>
</FormField>

<RegistrationTypeDropdown
selectedType={getRegistrationByName(registrationTypes, registrationType)}
Expand Down Expand Up @@ -376,10 +378,10 @@ export const FifthStep = () => (
);

export const Registration = ({
addresses,
formDefaultData,
onDownload,
networks,
profiles,
registrationTypes,
}: RegistrationProps) => {
const form = useForm({ mode: "onChange", defaultValues: formDefaultData });
Expand Down Expand Up @@ -413,7 +415,7 @@ export const Registration = ({
<div className="mt-8">
<TabPanel tabId={1}>
<FirstStep
addresses={addresses}
profiles={profiles}
form={form}
networks={networks}
registrationTypes={registrationTypes}
Expand Down Expand Up @@ -508,12 +510,5 @@ Registration.defaultProps = {
network: null,
address: null,
},
addresses: [
{
address: "FJKDSALJFKASLJFKSDAJFKFKDSAJFKSAJFKLASJKDFJ",
walletName: "My Wallet",
avatarId: "FJKDSALJFKASLJFKSDAJFKFKDSAJFKSAJFKLASJKDFJ",
formatted: "My Wallet FJKDSALJFKASL...SAJFKLASJKDFJ",
},
],
profiles: [],
};
Loading