Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Auto token add #1808

Merged
merged 17 commits into from
Jun 15, 2018
Merged

Auto token add #1808

merged 17 commits into from
Jun 15, 2018

Conversation

HenryNguyen5
Copy link

@HenryNguyen5 HenryNguyen5 commented May 16, 2018

Closes #1803
Closes #1809

@coveralls
Copy link

coveralls commented May 16, 2018

Coverage Status

Coverage decreased (-0.02%) to 55.351% when pulling 18b3af3 on auto-token-add into 88ba6b7 on develop.

@HenryNguyen5 HenryNguyen5 added status: ready for review Open PR's that are ready for technical review. Replaced with "changes needed" or "ready to merge". and removed wip labels May 16, 2018
@HenryNguyen5 HenryNguyen5 requested a review from ConnorBryan May 16, 2018 20:58
return this.tknArrToMap('address');
}

private tknArrToMap(key: Exclude<keyof Token, 'error'>) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I generally dislike any abbreviated names. Can we expand this out?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

onChange(address: Result<string>): void;
}

enum ErrType {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

When should these go in translations vs. inside a component? Seems counter to internationalization.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The previous component that this one is based off had inline errors, so i just kept as-is

);
}

private handleFieldChange = (args: React.FormEvent<HTMLInputElement>) => {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not a fan of using args vs. the standard e for HTMLInput events.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

const req = this.loadBalance(address);

// process request
this.currentRequest = req
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefer this.loadBalance(address) to be here, as it makes the "grammar" flow better, but I'm not married to the idea.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

// otherwise it was a failed fetch call
this.setState({ loading: false });
})
.then(() => (this.currentRequest = null));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There's no advantage to having another then cause to clear the request vs. putting it underneath the setState above.

Copy link
Contributor

@skubakdj skubakdj May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about this as well and came across this gist that expands on the pattern.

Looks like the then after a catch will always execute. So even if this.loadBalance(address) fails, this.currentRequest = null will still fire.

}

export class DecimalField extends React.Component<OwnProps, State> {
public static getDerivedStateFromProps(
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This repetitious logic (along with the checking for request on promise) might be a sign to use renderProps for composition -- thoughts?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Agreed.

Copy link
Contributor

@skubakdj skubakdj left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tested out the new features and can confirm they work well. Aside from a quick question, I think this PR is good to go 👍

// otherwise it was a failed fetch call
this.setState({ loading: false });
})
.then(() => (this.currentRequest = null));
Copy link
Contributor

@skubakdj skubakdj May 29, 2018

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I was wondering about this as well and came across this gist that expands on the pattern.

Looks like the then after a catch will always execute. So even if this.loadBalance(address) fails, this.currentRequest = null will still fire.


export class AddressField extends React.Component<OwnProps, State> {
public state: State = {
address: Result.from({ res: '' }),
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just a thought, might be helpful to have a Result.init method or something to act as a placeholder in situations like this.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, it wouldn't save much on the boilerplate though since i'd then have to specify the type of the generic as <string> anyway.

@@ -57,7 +101,32 @@ const erc20Abi = [
type: 'bool'
}
]
},
{
name: 'Transfer',
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's using the ERC20 Transfer event in this PR?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nothing really, just kept the ABI updated for future use since it can't hurt

skubakdj
skubakdj previously approved these changes Jun 1, 2018
package.json Outdated
@@ -111,6 +111,7 @@
"lint-staged": "7.0.4",
"mini-css-extract-plugin": "0.4.0",
"minimist": "1.2.0",
"nano-result": "0.0.2",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Note, I've republished this under mycrypto-nano-result, but I get tsc errors after switching over:

➜  MyCrypto git:(auto-token-add) yarn tscheck   
yarn run v1.7.0
$ tsc --noEmit
common/containers/Tabs/Contracts/index.tsx:29:18 - error TS2322: Type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<SubTabs> & Readonly<{ children?: ReactNode; }> & Readonly<Props>'.
  Type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'Readonly<Props>'.
    Property 'staticContext' is missing in type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }'.

29         <SubTabs tabs={tabs} match={match} location={location} history={history} />
                    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


common/containers/Tabs/ScheduleTransaction/components/Fields/ScheduleTimezoneDropDown/ScheduleTimezoneDropDown.tsx:26:33 - error TS2339: Property 'tz' does not exist on type 'typeof moment'.

26     const allTimezones = moment.tz.names();
                                   ~~


common/containers/Tabs/SendTransaction/index.tsx:73:26 - error TS2322: Type '{ tabs: Tab[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<SubTabs> & Readonly<{ children?: ReactNode; }> & Readonly<Props>'.
  Type '{ tabs: Tab[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'Readonly<Props>'.
    Property 'staticContext' is missing in type '{ tabs: Tab[]; match: match<{}>; location: Location; history: History; }'.

73                 <SubTabs tabs={tabs} match={match} location={location} history={history} />
                            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


common/containers/Tabs/SignAndVerifyMessage/index.tsx:39:20 - error TS2322: Type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'IntrinsicAttributes & IntrinsicClassAttributes<SubTabs> & Readonly<{ children?: ReactNode; }> & Readonly<Props>'.
  Type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }' is not assignable to type 'Readonly<Props>'.
    Property 'staticContext' is missing in type '{ tabs: { path: string; name: ReactElement<any>; }[]; match: match<{}>; location: Location; history: History; }'.

39           <SubTabs tabs={tabs} match={match} location={location} history={history} />
                      ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~


common/selectors/schedule/helpers.ts:24:17 - error TS2339: Property 'tz' does not exist on type 'typeof moment'.

24   return moment.tz(scheduleTimestamp.raw, timezone).toDate();
                   ~~


spec/utils/mockRouteComponentProps.ts:14:91 - error TS2322: Type '{ location: { search: string; key?: string | undefined; hash: string; pathname: string; state: {}; }; match: { params: any; isExact: boolean; path: string; url: string; }; history: { length: number; action: Action; location: Location; push: () => null; replace: () => null; createHref: () => string; block: () => () => null; go: () => null; goBack: () => null; goForward: () => null; listen: () => () => null; }; }' is not assignable to type 'RouteComponentProps<any, StaticContext>'.
  Property 'staticContext' is missing in type '{ location: { search: string; key?: string | undefined; hash: string; pathname: string; state: {}; }; match: { params: any; isExact: boolean; path: string; url: string; }; history: { length: number; action: Action; location: Location; push: () => null; replace: () => null; createHref: () => string; block: () => () => null; go: () => null; goBack: () => null; goForward: () => null; listen: () => () => null; }; }'.

 14 export const createMockRouteComponentProps = (props: IProps): RouteComponentProps<any> => ({

@HenryNguyen5 Also, where did you get 0.0.2 from? The repo is set to 0.0.1.

@dternyak dternyak merged commit 41f8ab8 into develop Jun 15, 2018
ConnorBryan added a commit that referenced this pull request Jun 16, 2018
dternyak pushed a commit that referenced this pull request Jun 18, 2018
* Add a new route for AddressBook

* Further templating of the AddressBook view

* Add initial functionality to handle a table of existing address labels

* Make the linter happy

* Adjust paths

* Factor out TableRow and add common functionality

* Add initial Redux boilerplate for addressBook | fix minor linting issues

* Swap out terminology and types

* Connect up to Redux

* Connect data for AddressBookTable to Redux

* Use temporary fields for addition

* Remove alignment and index column

* Stopping point

* Adjust the sizing of rows to be consistent

* Initial implementation of a dropdown for the address field

* Minor styling to dropdown

* Stopping point

* Apply a focus concept onto the factory

* Add keyboard controls for the address field dropdown

* Adjust label of address field when it matches an addressBook entry

* Properly handle attempting to blur a non-existent component

* Minor styling changes on dropdown box

* Standardize address casing, add accessibility to dropdown

* Create an addressLabel component

* Pass refs correctly and fix some typings

* Exact version

* Add module name mapping for shared/keycodes

* addressBook reducer tests

* Add functionality to DeterministicModal

* Minor changes / Add test for addressBook selectors

* Move out AddressBookTable to a component

* Typing, translation and restructuring

* More typing and translation fixes

* More linting fixes

* More type changes

* Variable name for dropdown background

* Fix TS type errors, lint errors, remove unused props

* Used a different selector and removed method: AddressBookTable

* Linter was mad

* Linter mad again :(

* Add a translation and adjust styling of AddressBookTable

* Move the onBlur to a class method

* Prevent the default behavior of up/down/enter for dropdown

* Let's do it this way instead

* Adjust the styling on DeterministicWalletModal labels

* Change `AddressBookTable` into a pseudo-table using section and div

* Use readable keys vs. keycodes

* Put the dropdown in InputFactory and position it correctly

* Sanitation of label adding and changing

* Prevent duplicate labels in AddressBook and Row

* Add a box shadow and use `invalid` class insted of custom

* Use emphasis vs strong for address in dropdown

* Display the label undernearth the input vs. changing it

* Isolate AccountAddress into its own component

* Introduce interactivity to AccountAddress

* Fully incorporate with Redux

* Validation for AccountAddress

* Add validation notifications for address field on AddressBookTable

* Minor formatting

* Adjust wrappage for optimal flexboxxing

* Make AddressBookTable responsive

* Show an invalid input in "real time" instead of only on submit

* Real time input validation for AddressBookTableRow

* Responsive-ize the To address dropdown

* Hide identicons instead at small enough screen sizes

* Fix repsonsiveness of dropdown further

* Fix responsiveness of table rows and inputs

* Truncate account info and switch identicons to the right for consistency

* Use classnames instead of targetting element directly for DWM

* Display a notice if the entered query doesnt match a label and isnt an addr

* Don't show an error on the To address if its a label entry

* Display an error under AddressBookTableRow in real time

* Display errors in real time for AddressBookTable temp inputs

* Add realtime validation to AccountAddress

* Ensure toChecksumAddress is used when entering labels to address manager

* Show errors even after blurring.

* Create a ducks/ implementation for addressBook

* Duck-ize notifications

* Duck-ize customTokens

* Duck-ize deterministicWallets

* Only show errors on address/label entry if they have been blurred

* On certain inputs, show an invalid input immediately

* spec files in same directory

* Rename top-level redux directory

* Duck-ize gas

* Add displayed errors for labels with 0x and labels containing ens

* Move ENS checking validation out

* Add a saga for addLabelForAddress

* Completely revamp the redux side of Address Manager and test it all

* Adjust components to use new redux addressBook

* Incorporate new redux into AddressBookTableRow and clean up for linter

* Make linter and tests happy

* Another reduxy overhaul

* Still fixing it

* More redux updates

* Finalize redux stuff.

* Incorporate new reduxy way into AddressBookTable & Row

* Incorporate redux changes into Account Address

* Small tests fix

* Add and fix some selector tests

* Addressing Will's comments

* Shortened visibility class for line length reasons.

* Incorporate ducks pattern on updates addressBook

* Fix typeerror

* Migrate messages to ducks

* For Henry

* Duckify onboardStatus

* Duckify paritySigner

* Duckify rates

* Duckify transactions

* Duckerize wallet

* Reduckerate config

* Adjust exports and tests of every duck so far

* Duckify ENS

* Duckerificate schedule

* Duckificate swap

* Actually use the new sagas;  fix a circular dependency problem.

* Duckify transaction (phew)

* Add basics to redux/ directory

* Remove non-ducked redux stuff

* First sweep of redux/ directory

* Combine redundant imports

* Fix more linting stuff.

* A few more type fixes

* Welp... now I know not to use index.

* Sweep components/

* Sweep through containers/

* Im really starting to get frustrated

* The dawn of a new age.

* Linter fixes.

* De-flatten config/ reducers

* Do my thang on config selectors

* Adjust all references to config

* Split up ens reducers

* Wrap up de-nesting ENS

* Big boy refactor

* Split transaction into its reducers

* Fix reducers in transaction/

* Stopping point

* Adjust references to transaction from components

* Fix references to selectors

* Nest broadcast actions

* Nest field actions

* Nest meta actions

* Nest network actions

* Nest sign actions

* Nest broadcast types

* Nested fields types

* Nest meta types

* Nested network types

* Nested sign types

* Implement transaction saga changes

* Huh? No prepush problems?

* Update snappshot

* Reintroduce deleted tests

* A few missing tests found

* Found three missing transaction tests

* Found more tests

* Found the rest of the tests, woohoo.

* Renamed TypeKeys in TRANSACTION

* Specify TRANSACTION_BROADCAST

* Pretty up these imports

* Specify TRANSACTION_FIELDS

* Specify TRANSACTION_META

* Specify TRANSACTION_NETWORK

* Specify TRANSACTION_SIGN

* Adjust imports and add translations

* Update config snapshot

* Post-merge

* Temporary fix for DW/Config sagas so Daniel can continue smoke testing

* Remove first circulat dependency

* Fix more circular dependencies

* Properly structure config indices

* Further restructure config

* Prepare for idea

* Target directly from within features/

* Remove that circular dependency -- woohoo

* Remove the circular dependency from Web3Wallet, temporarily comment some tests pending assistance

* Un-comment the component-in-redux phenomenon

* Move onLoad to the store file

* Adjust addressBook imports/exports

* Adjusted imports/exports for customTokens

* Adjust imports/exports of deterministicWallets

* Adjust imports/exports of ens

* Restructure imports/exports of gas

* Restructure imports/exports for message

* Adjust imports/exports of notifications

* Restructure onboardStatus imports/exports

* Restructure paritySigner imports/exports

* Restructure rates imports/exports

* Restructure schedule imports/exports

* Fix broadcastweb3handler test

* Restructure swap imports/exports/

* Restructure transactionS imports/exports

* Restructured wallet imports and exports

* Hoist all necessary selectors aside from config/**/* and transaction/**/*

* Hoist all top-level selectors from transaction

* [Fix] Estimate Gas on Value Field Change (#1942) @ skubakdj

* Implement right-click context menu (#1780) @ bryanwb

* No Private Keys Online (#1466) @ wbobeirne

* Fix Stuck Node on Metamask Logout (#1951) @ wbobeirne

* [Fix] Make ENS Value Consistent (#1956) @ skubakdj

* Auto token add (#1808) @ HenryNguyen5

* Electron Ledger + Trezor Support (#1836) @ wbobeirne

* Fix Context Menu Popup Parameters (#1957)

* Add RSK network w/ network agnostic refactors (#1939) @ wbobeirne

* Change displayed notification back in helpers.tsx

* Remove newline on shell files

* Re-add newlines

* Remove newling on .travis.yml

* Prettier two files

* Re-add index.scss import in OnboardModal

* Restructure transaction subdirectories

* Everything in transaction/ except for sagas

* Restructure transaction imports/exports

* Nest broadcast sagas

* Nest fields

* Nest meta

* Nest network

* Nest sign

* Use generic names for reduxy stuff in the same directory to save space

* Do everything every in the whole wide world
@dternyak dternyak deleted the auto-token-add branch June 19, 2018 18:32
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
status: ready for review Open PR's that are ready for technical review. Replaced with "changes needed" or "ready to merge".
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants