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.

Sign up for GitHub

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

Jump to bottom

Only call onRecipient and onSender methods if defined in sender-to-recipient #6247

Merged
merged 1 commit into from
Mar 6, 2019
Merged

Only call onRecipient and onSender methods if defined in sender-to-recipient #6247

merged 1 commit into from
Mar 6, 2019

Conversation

danjm
Copy link
Contributor

@danjm danjm commented Mar 6, 2019

@danjm danjm requested a review from whymarrh as a code owner March 6, 2019 14:29
whymarrh
whymarrh suggested changes Mar 6, 2019
View reviewed changes
ui/app/components/sender-to-recipient/sender-to-recipient.component.js Outdated
@@ -97,7 +97,7 @@ export default class SenderToRecipient extends PureComponent {
onClick={() => {
this.setState({ recipientAddressCopied: true })
copyToClipboard(checksummedRecipientAddress)
onRecipientClick()
onRecipientClick && onRecipientClick()
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use an if statement here instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done in fdda74b

ui/app/components/sender-to-recipient/sender-to-recipient.component.js Outdated
@@ -164,7 +164,7 @@ export default class SenderToRecipient extends PureComponent {
onClick={() => {
this.setState({ senderAddressCopied: true })
copyToClipboard(checksummedSenderAddress)
onSenderClick()
onSenderClick && onSenderClick()
Copy link
Contributor

Choose a reason for hiding this comment

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

Can we use an if statement here instead?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Done in fdda74b

@danjm danjm force-pushed the undefined-methods-sender-to-recip branch from 71762de to fdda74b Compare March 6, 2019 14:53
@metamaskbot
Copy link
Collaborator

Builds ready [fdda74b]: mascara, chrome, firefox, edge, opera

@danjm danjm merged commit d547e0b into develop Mar 6, 2019
@whymarrh whymarrh deleted the undefined-methods-sender-to-recip branch March 6, 2019 16:20
danfinlay pushed a commit that referenced this pull request Mar 26, 2019
@tmashuang @danfinlay
Update master branch (#6296)
b921c8f 
* Fixes the 'Percentages row tracks and gutters' decpracation warning. (#6244)

* Fix missing this reference in addtoken button onclick method (#6245)

* Only call onRecipient and onSender methods if defined in sender-to-recipient (#6247)

* Prevent advanced gas input arrows from setting value to < 0 (#6248)

* Add privacy policy link to modal metrics opt-in (#6250)

* Handle undefined gas limits and prices in transaction-breakdown.component (#6246)

* Uppercase and context fixes on Spanish translation.

* development - enhancement for sourcemap validator tool (#6277)

* Nonmultiple notifications for batch txs

* No longer check network when validating checksum addresses

* Version 6.2.1 (#6251)

* Remove line rather than comment out

* Fixes the use of the browser back button on the reveal seed screen

* GABA: Integrate AddressBookController (#5847)

* gaba: integrate AddressBookController

* pin gaba version and update lockfile

* ci: Use cache version from circle environment var (#6286)

* Allow npm to update the package-lock.json file

* npm i -D [email protected]

* mascara - remove from project (#6283)

* circleci - disable npm dep cache (#6288)

* Centre all notification popups

* ui - add missing PropTypes (#6287)

* Improve Korean translations (#6268)

* ci: Use npm ci for fast(er) installs

* build - babel - move config to babelrc (#6284)

* Patch/bump version (#6294)

* Update Node minor version

* ci: Skip updating npm@6 as it is default

* Allow seed phrases with a trailing newline

* Centre the notification in the current window (#6307)

* Fixes popups not showing when screen size is odd (#6312)

* Fix typos in English messages (#6317)

* Add rollback script, move auto-changelog script (#6252)

* Bump gaba version to avoid broken eth-contract-metadata

* Fixing spelling of Ethereum in MetaMetrics copy (#6329)

* Stop reloading dapps on network change allowing dapps to decide if it should refresh or not (#6330)

* feat: `inpageProvider.autoRefreshOnNetworkChange` to allow dapps to control if it refreshes or not

* feat: check the `autoRefreshOnNetworkChange` before a refresh

* fix linting error

* fix: use `window.ethereum` now `web3.ethereum`

* Enable mobile sync (#6332)

* enable mobile sync

* remove mobile sync as a preference

* Fix typo

* Folder restructure (#6304)

* Remove ui/app/keychains/

* Remove ui/app/img/ (unused images)

* Move conversion-util to helpers/utils/

* Move token-util to helpers/utils/

* Move /helpers/*.js inside /helpers/utils/

* Move util tests inside /helpers/utils/

* Renameand move confirm-transaction/util.js to helpers/utils/

* Move higher-order-components to helpers/higher-order-components/

* Move infura-conversion.json to helpers/constants/

* Move all utility functions to helpers/utils/

* Move pages directory to top-level

* Move all constants to helpers/constants/

* Move metametrics inside helpers/

* Move app and root inside pages/

* Move routes inside helpers/

* Re-organize ducks/

* Move reducers to ducks/

* Move selectors inside selectors/

* Move test out of test folder

* Move action, reducer, store inside store/

* Move ui components inside ui/

* Move UI components inside ui/

* Move connected components inside components/app/

* Move i18n-helper inside helpers/

* Fix unit tests

* Fix unit test

* Move pages components

* Rename routes component

* Move reducers to ducks/index

* Fix bad path in unit test

* Hide gas price chart and prevent api call when not on ethereum networks. (#6300)

Add missing translations in gas customization modal

* Fix gas fee in the submitted step of the transaction details activity log. (#6301)

* Fix oversized loading overlay on gas customization modal. (#6326)

* Replaces the coinbase link in the deposit modal with one for wyre (#6302)

* New settings page rebased (#6333)

* New setting tab

* Add InfoTab

* Add Advanced tab

* Add Security Tab

* Finish mobile view

* Make new setting page responsive

* Fix linter

* Fix y scrolling

* Update link in network dropdown

* Fix e2e tests

* Remove duplicate translation key

* Resolve merge conflict

* Only change settings header in popup view.

* Place mobile-sync button in advanced-tab of settings

* Close transaction on close of notification window (#6340)

* Cancel error rebased (#6341)

* Check balance before showing cancel

* Fix linter

* Use existing helper methods for calculating increased cancel price

* Add tooltip for disabled button

* Lint fix for cancelError branch.

* Disabling of cancel button should account for value of tx.

* E2E - Dont close window notifications (#6349)

* Dont close window notifications

* Remove commented out lines in beta spec

* Don't include tx value in calculation of balance sufficiency for cancel button disabling. (#6346)

* enable privacy mode for first time users (#6347)

* Version 6.3.0 (#6350)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@whymarrh whymarrh whymarrh approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@danjm @metamaskbot @whymarrh