feature(unlock-app, locksmith): Cancel card paid memberships #13123
Conversation
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
julien51
commented
Dec 20, 2023
| lockAddress, | ||
| network, | ||
| userAddress, | ||
| await KeySubscription.update( |
There was a problem hiding this comment.
Instead of deleting we just move to 0 recurring.
julien51
commented
Jan 3, 2024
| @@ -25,7 +25,7 @@ export interface Subscription { | |||
| price: Amount | |||
| possibleRenewals: string | |||
| approvedRenewals: string | |||
| type: 'Crypto' | 'Stripe' | |||
| type: 'crypto' | 'stripe' | |||
There was a problem hiding this comment.
fixing the types... based on openapi
| @@ -54,42 +54,63 @@ export const getSubscriptionsForLockByOwner = async ({ | |||
| ) | |||
|
|
|||
| // If no key is found or not erc20 or version < 11 which we don't fully support, return nothing. | |||
| if ( | |||
| !key || | |||
| key.lock.tokenAddress === ethers.constants.AddressZero || | |||
There was a problem hiding this comment.
We may actually have card recurring even if the lock itself does not support recurring thru an ERC20.
| @@ -43,7 +44,7 @@ export const CancelAndRefundModal = ({ | |||
| ['getAmounts', lockAddress], | |||
| getAmounts, | |||
| { | |||
| enabled: isOpen, // execute query only when the modal is open | |||
| enabled: isOpen && subscription.type !== 'Stripe', | |||
There was a problem hiding this comment.
for cards there is no refund.
| } | ||
|
|
||
| const cancelRefundMutation = useMutation(cancelAndRefund, { | ||
| onSuccess: () => { | ||
| ToastHelper.success('Key cancelled and successfully refunded.') | ||
| ToastHelper.success('Key cancelled.') |
There was a problem hiding this comment.
Removed the mention of refund as it might not be applicable!
| tokenId={tokenId} | ||
| network={network} | ||
| expiration={expiration} | ||
| imageURL={metadata.image} | ||
| /> | ||
| <CancelAndRefundModal |
There was a problem hiding this comment.
Move that into the drawer for simplicity
| @@ -485,16 +456,6 @@ function Key({ ownedKey, account, network }: Props) { | |||
| <CopyLineIcon size={18} /> | |||
| </button> | |||
| </div> | |||
| <a | |||
There was a problem hiding this comment.
There is already a lin to the block explorer in the "action" menu
Comment on lines
+66
to
+93
| let userBalance, | ||
| decimals, | ||
| userAllowance, | ||
| symbol, | ||
| numberOfRenewalsApprovedValue, | ||
| numberOfRenewalsApproved | ||
|
|
||
| if ( | ||
| key.lock.tokenAddress && | ||
| key.lock.tokenAddress !== ethers.constants.AddressZero | ||
| ) { | ||
| ;[userBalance, decimals, userAllowance, symbol] = await Promise.all([ | ||
| getErc20BalanceForAddress(key.lock.tokenAddress, key.owner, provider), | ||
| getErc20Decimals(key.lock.tokenAddress, provider), | ||
| getAllowance( | ||
| key.lock.tokenAddress, | ||
| key.lock.address, | ||
| provider, | ||
| key.owner | ||
| ), | ||
| getErc20TokenSymbol(key.lock.tokenAddress, provider), | ||
| ]) | ||
|
|
||
| // Approved renewals | ||
| numberOfRenewalsApprovedValue = | ||
| userAllowance.gt(0) && parseFloat(price) > 0 | ||
| ? userAllowance.div(price) | ||
| : ethers.BigNumber.from(0) |
There was a problem hiding this comment.
This is hard to read. Can we split it down?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Description
We did not have a good way to cancel recurring card payments.
Issue: #13111
Checklist:
Release Note Draft Snippet