Pay with Business accounts #797
Merged
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
Contributor
OmerGery
commented
Dec 31, 2023
•
OmerGery
commented
…ethods in default payment select
OmerGery
commented
Jan 4, 2024
| import styled from 'styled-components'; | ||
| import moment from 'moment'; |
ormiz
approved these changes
Jan 4, 2024
| line-height: 24px; | ||
| padding-left: 4px; | ||
| `; | ||
|
|
| `; | ||
| const BoldTitle = styled(BaseText)` | ||
| font-weight: 700; | ||
| `; |
avivbarniv
reviewed
Jan 21, 2024
| export const BaseText = styled(Text)` | ||
| color: #212229; | ||
| font-family: Inter; | ||
| font-size: 14px; |
avivbarniv
reviewed
Jan 21, 2024
| @@ -49,7 +51,7 @@ const margin = `margin-${Start()}`; | |||
| const TextContainer = styled(View)` | |||
| justify-content: center; | |||
| ${margin}: 16px; | |||
| width: 80%; | |||
| width: ${({ noSvg } : { noSvg: boolean}) => (noSvg ? '95%' : '80%')}; | |||
There was a problem hiding this comment.
undid the changes, it actually doesnt affect anything
avivbarniv
reviewed
Jan 21, 2024
| @@ -205,6 +232,17 @@ const CardRow = (paymentMethod: any) => { | |||
| {paymentMethod.disabledReason} | |||
| </Description> | |||
| )} | |||
| {(paymentMethod.mark && paymentMethod.alignMarkToRight) ? ( | |||
| <SvgIcon | |||
| style={{ | |||
There was a problem hiding this comment.
Why it needs custom style? you may use flex to place it right
avivbarniv
reviewed
Jan 21, 2024
| color: #666975; | ||
| text-align: center; | ||
| font-family: Inter; | ||
| font-size: 14px; |
avivbarniv
reviewed
Jan 21, 2024
| color: #212229; | ||
| text-align: center; | ||
| font-family: Inter; | ||
| font-size: 14px; |
ormiz
approved these changes
Jan 21, 2024
avivbarniv
reviewed
Jan 21, 2024
| const saveLastRide = async (rideId: string) => { | ||
| await StorageService.save({ lastRideId: rideId }); | ||
| }; | ||
| const saveOrderedRidePaymentMethod = async (rideBusinessAccountId: string | null) => Promise.all([ | ||
| StorageService.save({ lastBusinessAccountId: rideBusinessAccountId || PAYMENT_MODES.PERSONAL }), | ||
| StorageService.save({ orderedRide: true }), |
There was a problem hiding this comment.
merge the payment method logic
avivbarniv
reviewed
Jan 21, 2024
|
|
||
| const paymentMethodNotAllowedOnService = chosenService && ride?.paymentMethodId | ||
| && !chosenService.allowedPaymentMethods.includes(getPaymentMethod(ride.paymentMethodId)); | ||
| const paymentMethodNotAllowedOnService = !businessAccountId |
There was a problem hiding this comment.
maybe split it to 2 variables? will be easier to read
avivbarniv
reviewed
Jan 21, 2024
| flex: 10; | ||
| color: #212229; | ||
| font-family: Inter; | ||
| font-size: 16px; |
avivbarniv
reviewed
Jan 21, 2024
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.