Skip to content

Commit

Permalink
Merge branch 'master' into feature/EIT-3042-remove-assets-for-eu
Browse files Browse the repository at this point in the history
* master:
  Update to CAP SDK 2.2.1
  Update gitignore to comply with latest Android Studio
  • Loading branch information
ScottAntonacAP committed Aug 4, 2023
2 parents e3f33c6 + 22cfba2 commit 388d10b
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 19 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -82,6 +82,8 @@ obj/
.idea/gradle.xml
.idea/jarRepositories.xml
.idea/runConfigurations.xml
.idea/deploymentTargetDropDown.xml
.idea/kotlinc.xml

# OS-specific files
.DS_Store
Expand Down
17 changes: 0 additions & 17 deletions .idea/deploymentTargetDropDown.xml

This file was deleted.

2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ buildscript {
'espresso' : '3.5.1',
'uiautomator' : '2.2.0',
'ktlint' : '0.49.1',
'cash_app_paykit_sdk' : '2.1.0',
'cash_app_paykit_sdk' : '2.2.1',
'mockk' : '1.13.5'
]

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@ class CheckoutFragment : Fragment() {
when (validationResult) {
is CashAppValidationResponse.Success -> {
val responseData = CashData(
cashTag = customerResponseData.customerProfile?.cashTag ?: "unknown",
cashTag = customerResponseData.customerProfile?.cashTag?.toString() ?: "unknown",
amount = (
grant.action.amount_cents?.toBigDecimal()
?.divide(centsDivisor.toBigDecimal())
Expand Down

0 comments on commit 388d10b

Please sign in to comment.