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

UPI intent integration #1615

Merged
merged 33 commits into from
Jun 19, 2024
Merged

UPI intent integration #1615

merged 33 commits into from
Jun 19, 2024

Conversation

araratthehero
Copy link
Contributor

@araratthehero araratthehero commented May 3, 2024 •
edited
Loading

Description

The following changes have been made:

  • Add payment apps as part of UPI intent flow
  • Show generic and manual input app types when UPI collect is available
  • Make showing different UPI modes dynamic, which is controlled from the delegate
  • Generate UPIPaymentMethod based on chosen UPI types and/or apps
  • Modify await action component to support redirection
  • Fix the bug when setting setInteractionBlocked to true would not disable the pay button.

Checklist

  • PR is labelled
  • Code is unit tested
  • Changes are tested manually

COAND-866

@araratthehero araratthehero force-pushed the feature/upi_intent_integration branch 2 times, most recently from 0aa3597 to 4886b28 Compare May 3, 2024 08:53
@araratthehero araratthehero added the Feature [PRs only] Indicates a new feature addition label May 3, 2024
@ozgur00 ozgur00 force-pushed the feature/upi_intent_integration branch from 4886b28 to 70ae53e Compare May 15, 2024 12:22
@araratthehero araratthehero force-pushed the feature/upi_intent_integration branch 8 times, most recently from d357366 to fcc66c4 Compare May 31, 2024 09:07
@araratthehero araratthehero force-pushed the feature/upi_intent_integration branch 2 times, most recently from df8c15f to 524f9d2 Compare June 4, 2024 12:24
@araratthehero araratthehero marked this pull request as ready for review June 4, 2024 13:53
@araratthehero araratthehero requested a review from a team as a code owner June 4, 2024 13:53
OscarSpruit
OscarSpruit reviewed Jun 10, 2024
View reviewed changes
await/src/main/java/com/adyen/checkout/await/internal/ui/DefaultAwaitDelegate.kt Show resolved Hide resolved
components-core/src/main/java/com/adyen/checkout/components/core/App.kt Outdated Show resolved Hide resolved
components-core/src/main/java/com/adyen/checkout/components/core/App.kt Outdated Show resolved Hide resolved
ui-core/src/main/java/com/adyen/checkout/ui/core/AdyenComponentView.kt Show resolved Hide resolved
upi/src/main/java/com/adyen/checkout/upi/internal/ui/DefaultUPIDelegate.kt Outdated Show resolved Hide resolved
upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIIntentGenericAppViewHolder.kt Outdated Show resolved Hide resolved
upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIIntentManualAddressViewHolder.kt Show resolved Hide resolved
upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt Show resolved Hide resolved
upi/src/main/java/com/adyen/checkout/upi/internal/ui/view/UPIView.kt Show resolved Hide resolved
upi/src/main/res/layout/upi_app.xml Show resolved Hide resolved
@araratthehero araratthehero force-pushed the feature/upi_intent_integration branch 6 times, most recently from 72307c0 to 8e94ea5 Compare June 14, 2024 11:08
@araratthehero araratthehero force-pushed the feature/upi_intent_integration branch from 8e94ea5 to 35d828b Compare June 14, 2024 14:31
@OscarSpruit OscarSpruit force-pushed the feature/upi_intent_integration branch from 35d828b to 87ce25f Compare June 18, 2024 15:02
ozgur00 and others added 22 commits June 19, 2024 11:29
@ozgur00 @OscarSpruit
Support upi_intent in UPIComponent
64893fe 
COAND-866
@ozgur00 @OscarSpruit
Rename UpiCollect to UpiIntent
9397521 
COAND-866
@ozgur00 @OscarSpruit
Update mode selection disclaimer translations
195d3ca 
COAND-866
@araratthehero @OscarSpruit
Move item selection state to delegate and select no items by default
530b7e6 
COAND-866
@araratthehero @OscarSpruit
Remove mock data and change generic app logo
cff68a2 
COAND-866
@araratthehero @OscarSpruit
Add tests for UPIAppIdUtils and UPISelectedMode
57a0692 
COAND-866
@araratthehero @OscarSpruit
Add tests for DefaultUPIDelegateTest
bde5bfa 
COAND-866
@araratthehero @OscarSpruit
Add redirect in await action and do the redirect if url is not null
980cf43 
COAND-866
@araratthehero @OscarSpruit
Fix detect
2b86397 
COAND-866
@araratthehero @OscarSpruit
Update translations
cb81a7e 
COAND-866
@araratthehero @OscarSpruit
Fix button not tweaking its enabled state
128258f 
COAND-866
@araratthehero @OscarSpruit
Implement a flow where submit button can be disabled when there is no…
16b96fb 
… option selected.

COAND-866
@araratthehero @OscarSpruit
Fix UPIIntentItem areItemsTheSame/areContentsTheSame methods and use …
b043a7f 
…areItemsTheSame to verify the selected item

COAND-866
@araratthehero @OscarSpruit
Change App to AppData
e57575d 
COAND-866
@araratthehero @OscarSpruit
Move selected state to UPIIntentItem
084497f 
COAND-866
@araratthehero @OscarSpruit
Move onClickListener to the bind function
2866091 
COAND-866
@araratthehero @OscarSpruit
Clean up code
22f5ac4 
COAND-866
@araratthehero @OscarSpruit
Optimise validation logic
e81135d 
COAND-866
@araratthehero @OscarSpruit
Fix UI alignment
b1b33ac 
COAND-866
@araratthehero @OscarSpruit
Do not translate tab titles
ab083e6 
COAND-866
@OscarSpruit
Make await-redirect flow more explicit
4c31a3e 
This also makes sure the logo of the payment method will be loaded regardless of the redirect.

COAND-866
@OscarSpruit
Move new fields to bottom of existing data classes
53d534f 
This makes sure the api doesn't break.

COAND-866
@OscarSpruit OscarSpruit force-pushed the feature/upi_intent_integration branch from b57cefb to 53d534f Compare June 19, 2024 09:29
@github-actions GitHub Actions
Copy link

✅ Public API Changes

No changes detected!

@sonarqubecloud SonarQubeCloud
Copy link

Quality Gate Failed Quality Gate failed

Failed conditions
79.3% Coverage on New Code (required ≥ 80%)

See analysis details on SonarCloud

@OscarSpruit OscarSpruit merged commit eb696b4 into develop Jun 19, 2024
8 of 9 checks passed
@OscarSpruit OscarSpruit deleted the feature/upi_intent_integration branch June 19, 2024 12:40
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@jreij jreij jreij approved these changes

@OscarSpruit OscarSpruit Awaiting requested review from OscarSpruit

Assignees
No one assigned
Labels
Feature [PRs only] Indicates a new feature addition
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
4 participants
@araratthehero @jreij @OscarSpruit @ozgur00