-
Notifications
You must be signed in to change notification settings - Fork 3k
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
Adds KYC Wall trigger for Transfer Balance action #7211
Merged
Merged
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit
Hold shift + click to select a range
b1984f0
Fix up popover placements
marcaaron bdd4dc3
Merge
marcaaron c857f8b
add paddingRight style to paypal button
marcaaron 02d52cd
Merge remote-tracking branch 'origin' into marcaaron-transferBalanceKYC
marcaaron 4f77c4c
Add userWallet to formatPaymentMethods
marcaaron d49c4a4
fix various things
marcaaron c9cdedf
Update propTypes
marcaaron 3d1a7ee
fix conflicts
marcaaron File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -30,7 +30,7 @@ const propTypes = { | |
userWallet: userWalletPropTypes.userWallet, | ||
|
||
/** Array of bank account objects */ | ||
bankAccountList: PropTypes.arrayOf(PropTypes.shape({ | ||
bankAccountList: PropTypes.objectOf(PropTypes.shape({ | ||
/** The name of the institution (bank of america, etc) */ | ||
addressName: PropTypes.string, | ||
|
||
|
@@ -45,7 +45,7 @@ const propTypes = { | |
})), | ||
|
||
/** Array of card objects */ | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. NAB: Same here? Which can be an Object (or Dictionary) of card objects? |
||
cardList: PropTypes.arrayOf(PropTypes.shape({ | ||
cardList: PropTypes.objectOf(PropTypes.shape({ | ||
/** The name of the institution (bank of america, etc) */ | ||
cardName: PropTypes.string, | ||
|
||
|
@@ -64,8 +64,8 @@ const propTypes = { | |
|
||
const defaultProps = { | ||
userWallet: {}, | ||
bankAccountList: [], | ||
cardList: [], | ||
bankAccountList: {}, | ||
cardList: {}, | ||
walletTransfer: {}, | ||
}; | ||
|
||
|
@@ -97,6 +97,8 @@ class TransferBalancePage extends React.Component { | |
]; | ||
|
||
this.saveTransferAmountAndBalance = this.saveTransferAmountAndBalance.bind(this); | ||
this.getSelectedPaymentMethodAccount = this.getSelectedPaymentMethodAccount.bind(this); | ||
|
||
const selectedAccount = this.getSelectedPaymentMethodAccount(); | ||
PaymentMethods.saveWalletTransferAccountAndResetData(selectedAccount ? selectedAccount.id : ''); | ||
} | ||
|
@@ -106,12 +108,7 @@ class TransferBalancePage extends React.Component { | |
* @returns {Object|undefined} | ||
*/ | ||
getSelectedPaymentMethodAccount() { | ||
const paymentMethods = PaymentUtils.formatPaymentMethods( | ||
this.props.bankAccountList, | ||
this.props.cardList, | ||
this.props.userWallet, | ||
); | ||
|
||
const paymentMethods = PaymentUtils.formatPaymentMethods(this.props.bankAccountList, this.props.cardList, '', this.props.userWallet); | ||
const accountID = this.props.walletTransfer.selectedAccountID || lodashGet(this.props, 'userWallet.walletLinkedAccountID', ''); | ||
return _.find(paymentMethods, method => method.methodID === accountID); | ||
} | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
NAB: Ah I think we should update that this is no longer an array but an object, no?