Commit Graph

653 Commits

Author SHA1 Message Date
Connor Bryan 0d13dc93c5 Add additional validation to Amount input field (#1982)
* Adjust the validator and update validity class logic on AmountField

* Improve readability and add a condition to invalidity for Input

* Undo changes to Input and pass down showInvalidWithoutValue

* Fix prop ordering issue

* Add removed validator

* Adjust logic for NoneField
2018-07-02 16:51:51 -05:00
Roman Storm a3a92504d2 Update POA Node URL (#1986)
* Closes #1984. Change POA.network RPC endpoint to Poa.Infura.io

* change type to infura
2018-07-02 16:48:32 -05:00
Connor Bryan 54b479f04e Disable buttons on confirmation modal when transaction is broadcasting (#1987)
* Fix an issue where the disableButtons property was not being passed to the modal body.

* Add a hideButtons property for modals and hide the buttons for a broadcasting confirmation modal

* Don't show fade when there are no buttons
2018-07-02 16:44:44 -05:00
Danny Skubak 6718e7ef65 Refactor Bad Browser Check (#1996)
* move bad browser check into standalone files

* refactor dup var

* remove console logs

* have warning support all browser versions

* Revert "have warning support all browser versions".

Webpack conventions still cause IE8 to break.

This reverts commit a853103862.

* correct typo
2018-07-02 16:39:25 -05:00
Alejandro Cavallero 9d4769342f RSK Mainnet configuration (#1994)
* RSK mainnet configuration

* Changes to fix errors on push

* Reverts unnecessary props
2018-07-02 16:37:19 -05:00
Jean-Christophe Rona 9a52a47e13 Fully translate MyCrypto into French (#1970)
* Allow to translate several hard coded strings

* Clean and finish french translations

* Several FR translation fixes

 - open-source -> code source libre
 - capitalize titles
 - typos/translation errors

* Fix EN translation and add U2F_NOT_SUPPORTED to FR translation
2018-06-28 23:46:25 -05:00
HackyMiner 7eb103f747 Update Korean Translation (#1880)
* update Korean translation

 * 100% transated
 * all missing strings added
 * proofread by @dakeshi

* update newly added messages

* update Korean translation

 * update recently added messages
 * profreading done by @dakeshi
2018-06-27 00:07:55 -05:00
William O'Beirne bf6a122e38 Night Mode Theme (#1896)
* Initial changes to define theme maps, color function, and convert all global styles.

* More global styles.

* All styles converted, colors uncertain.

* Fix tabs, temporary theme toggle button.

* Color refinements

* Color network selector, introduce shade function

* Make palette page

* Add theme button and minor styling to nav

* Blueify dark theme

* A bunch of color adjustments to work better with dark theme

* Fix tables

* Fix wallet decrypt colors

* More misc fixes

* Fix up electron colors

* Convert web theme to redux state / action

* Theme toggle in app, prevent rerenders

* Get rid of all variables, fix selects

* Fix conf modal, modal close styles

* Fix test

* Adjust swap colors

* Check in breaking out component, changing icons

* Check in progress

* Theme toggle in footer. New icons

* Prevent rerender on theme change

* Fix up outstanding merge conflicts

* Fix generate colors to be dark mode friendly

* Reduce swap color intensity

* Make disabled buttons darker in dark mode

* Reduce button size by 25%
2018-06-26 23:51:42 -05:00
Connor Bryan c574a17884 Update ShapeShift support emails (#1983)
Update ShapeShift support emails
2018-06-26 13:54:45 -05:00
Connor Bryan 23f6ffe56f Temporary fix for .eth.eth (#1978)
* Update config snapshot

* Add another condition in  to ensure no period delimiters
2018-06-25 19:39:13 -05:00
William O'Beirne 3074e50909 Allow PIN Entry for TREZOR One in App (#1971)
* Create popup window for TREZOR pin.

* Address PR feedback. Move pin template into its own file loaded via raw-loader.

* Fix PIN not unlocking

* Dont minify electron main code
2018-06-25 14:27:27 -05:00
HackyMiner 1ab0d819d0 EthersocialNetwork Support (ESN) (#1881) (#1881) 2018-06-25 12:59:39 -05:00
Connor Bryan aa68beb115 Adjust error message for "U2F not supported" (#1976)
* Update config snapshot

* Add checking for other types of messages for ledger and improve verbiage.
2018-06-25 12:30:56 -05:00
Connor Bryan a297eb764a Enable back button from "active wallet" to "select a wallet" (#1979) 2018-06-21 23:36:17 -05:00
Connor Bryan edb43fdf6b Adjust the TransactionActions enum (#1980) 2018-06-21 23:35:39 -05:00
EOS Classic cb5530c3a7 [EOSC] Add EOS Classic node support (#1962) 2018-06-19 19:41:03 -05:00
HenryNguyen5 9f4f50199c Support undefined input names (#1964) 2018-06-19 12:14:36 -05:00
Connor Bryan e761b9d1fb Refactor redux pattern from top-level to ducks (#1936)
* 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
2018-06-17 20:53:00 -05:00
William O'Beirne 994fa03828 Add RSK network w/ network agnostic refactors (#1939)
* Rsk network with checksum

* Initial change from chainid everywhere to selectors

* Fix ternary

* Check in address book changes to lower case. Currently a little busted.

* Fix validation

* Fix tests.

* Identicon back to SFC

* Remove unnecessary prop

* Paper Wallet Refactor (#1950)

* Convert print wallet to save png image. Move all styles into CSS.

* Fix re-print paper wallet with save modal

* Address PR comments
2018-06-15 18:28:42 -05:00
William O'Beirne cb92f59e57 Electron Ledger + Trezor Support (#1836)
* Initial scaffold of enclave

* Cleanup types

* Add comments

* Do not truncate errors, pretty output

* Introduce helpers for sagas

* Update yarn lock

* Convert enclave into its own lib. Implement client and server.

* Check in progress

* Initial types

* Remove unused lib

* Finish types

* cleanup

* Switch over to using electron protocol, remove code thats no longer necessary

* Refactor Ledger and Trezor wallets to provide all functionality via libs. Run chain code generation thru Enclave.

* Check in trezor work

* Transaction signing

* Message signing

* Display address

* Fix deallocation of trezor

* Adjust API

* Remove unused getAddresses

* Fix imports and filenames to cooperate with internal typings

* Fix type uncertainty

* Add persistent message to Ledger unlock.

* Update ledger help link to kb

* Convert ledger over to updated libs

* Fix jest config

* Enclave README

* Unnecessary assertion

* Adjust tip

* Type ledger errors

* Reduce enclave client code.

* No default exports

* l18n user facing enclave errors

* Reduce repeated enclave code by splitting it into its own wallet lib. Fix some types

* tslint

* Reduce repeated enclave code by splitting it into its own wallet lib. Fix some types and error messages.

* Electron TREZOR Support (#1946)

* Type trezor connect.

* Check in trezor code

* Implement TREZOR wallet

* Convert TREZOR to use enclave class like Ledger.

* Switch to mycrypto fork of trezor lib. Remove unused dependencies.

* remove unnecessary window attachment

* tslint
2018-06-15 18:25:29 -05:00
HenryNguyen5 41f8ab8966 Auto token add (#1808)
* Add support for decimal and symbol getters

* Make custom token form interactive via address lookup

* Add balance field, improve error handling

* Fix lint errors

* Fix erc20 interface

* Expand method name

* Normalize parameter name

* Remove extra variable

* Stricten typing for decimals

* Use common input field between decimal and symbol fields

* use mycrypto-nano-result
2018-06-15 16:10:30 -05:00
Danny Skubak cd26970d7f [Fix] Make ENS Value Consistent (#1956)
* add hex prefix to labelHash

* update formatting, display highest bid as ether

* remove unused var
2018-06-15 15:48:19 -05:00
William O'Beirne 88ba6b7d23 Fix Stuck Node on Metamask Logout (#1951) 2018-06-14 11:22:41 -05:00
William O'Beirne a3fe8db5cf No Private Keys Online (#1466)
* Alternative generate options

* Back button when choosing wallet options

* Disable insecure wallets online.

* Style adjustments.

* Splash of color, generate on html build too.

* Removed unnecessary image

* Delete file
2018-06-13 19:21:02 -05:00
Danny Skubak 9c9f3c3611 [Fix] Estimate Gas on Value Field Change (#1942)
* estimate gas on value set

* update test, add test, update snapshot
2018-06-13 17:54:05 -05:00
r-kononov 14e361b843 Add GO support (#1938) 2018-06-13 15:39:50 -05:00
HenryNguyen5 74cb8de16e Custom node defaults (#1829)
* Add eth-exists dep

* Add elementary support for custom nodes

* Update eth-exists references
2018-06-12 12:01:14 -05:00
Daniel Ternyak 237c826141
Show (AUTO) in Node Selection (#1931) 2018-06-11 17:54:36 -05:00
HenryNguyen5 59d2b73fad Revamp Offline Status Checker (#1917)
* Revamp app status to be event listener based

* Update lockfile

* Update snapshot

* Show invalid only if .has-blurred

* revert yarn.lock changes

* Clean up input classes and types (#1925)

* Show invalid for Nonce Field when empty (#1930)
2018-06-11 17:43:39 -05:00
Danny Skubak c21d520422 Bug Fix for #1813 (#1927)
* move transaction reset to componentWillMount

* revert initialState change
2018-06-11 16:53:49 -05:00
Danny Skubak d75cd5ccdb Bug Fix for #1863 (#1929)
* use RedirectWithQuery wrapper instead of Redirect

* remove unused var
2018-06-11 16:46:03 -05:00
William O'Beirne 5ba62ccd45 Hex prefix & checksum paper wallet address. (#1926) 2018-06-11 16:22:25 -05:00
Daniel Ternyak 835b81a94c
Set custom dPath for address verification on ledger (#1918)
* set custom dPath for address verification on ledger

* trigger mycryptobuild
2018-06-08 12:49:43 -05:00
Daniel Ternyak 2b60ba9650
Update Tokens (#1886) 2018-06-01 16:05:55 -05:00
Akira Takizawa 8e9e01ad4c ETC Chainkorea Node (#1877) 2018-05-31 10:45:58 -05:00
Daniel Ternyak b047c89690
Update ETC Epool Node URL (#1876) 2018-05-30 22:56:08 -05:00
Daniel Ternyak bc9ded503f
Remove MyCrypto Chrome Extension from Onboarding (#1875) 2018-05-30 22:36:04 -05:00
William O'Beirne c29d13eac8 Add New Networks w/ Refactor (MUSIC, ETSC, EGEM, CLO) (#1862)
* Add EGEM, ETSC, and MUSIC networks. Remove unused gasEstimate property.

* Add CLO
2018-05-30 18:57:12 -05:00
William O'Beirne 724f1161ea Fix getting stuck pending when node load fails (#1871) 2018-05-29 21:24:38 -05:00
Cody Burns 9f9f0a527a Update epool node (#1867)
mewapi.epool.io >> mew.epool.io
2018-05-29 16:09:19 -05:00
Daniel Ternyak e0fd7dfe56
Google Site Verification (#1865) 2018-05-29 13:45:04 -05:00
William O'Beirne a057136c83 Simplify Web3 Provider Identifier (#1861)
* Check in progress

* Revert some files to develop.
2018-05-29 13:39:20 -05:00
Daniel Ternyak 0f6273ec03
Fix JSON (#1866) 2018-05-29 12:45:28 -05:00
James Prado cecd7f865c Simplex promo (#1839)
* Add simplex promo for euro

* Fix when isEuroLocal() called

* Add promo strings to translation files
2018-05-29 10:52:14 -05:00
William O'Beirne a043334685 Node Refactor (#1603)
* Initial work on refactoring node definitions to reduce number of places theyre defined, amount of copy pasting.

* Use makeAutoNodeNAme instead of manually appending _auto

* Add getNetVersion to list of unsupported methods

* PR feedback

* Rework web template node selector to be a network selector. Refactor some types to help with that. Better handle removing custom nodes.

* Remove color dropdown.

* Fix selecting custom networks. Show notification if change network intent fails.

* Use selectors for current node / network instead of intuiting from nodeSelection

* Add id key to all networks, simplify add and remove custom node and network functions.

* Fix a lot of uses of network.name to use network.id instead.

* Dont allow network chainid conflicts

* Fix web3 network by chainid

* Add testnet badge to network selector

* Change nomenclature from change(Node|Network)(Intent)? to change(Node|Network)(Requested|Succeeded)

* tscheck

* Better code for chainid collision

* Remove console logs

* Fix tests

* Network selector becomes self contained component used both by web header and electron nav.

* Dont select node again

* Additional title text

* tscheck

* Custom node behavior in Electron

* Close panel too

* Convert node label data into selector function

* tscheck

* Parens & space
2018-05-29 09:51:42 -05:00
HenryNguyen5 9bdeab2307 Clear transaction state on tab changes (#1852) 2018-05-25 12:30:22 -05:00
HenryNguyen5 9817f9576f Add dropdown for boolean inputs (#1845) 2018-05-24 18:22:33 -05:00
Daniel Ternyak 120791e75b
Update Electron Expiration (#1844) 2018-05-24 17:10:57 -05:00
Connor Bryan 04f75a6a27 Address Manager (#1657)
* 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.

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

* On certain inputs, show an invalid input immediately

* 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.
2018-05-21 18:10:51 -05:00
HenryNguyen5 c763b2ac98 Ledger types (#1690)
* Do not truncate errors, pretty output

* Introduce helpers for sagas

* Update yarn lock

* Initial types

* Finish types

* cleanup

* Fix imports and filenames to cooperate with internal typings
2018-05-21 15:47:25 -05:00