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.

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

[#1533] Flexa integration #1588

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
Draft

Conversation

Milan-Cerovsky
Copy link
Contributor

@Milan-Cerovsky Milan-Cerovsky commented Sep 16, 2024

Closes #1533

Author

  • Self-review your own code in GitHub's web interface1
  • Add automated tests as appropriate
  • Update the manual tests2 as appropriate
  • Check the code coverage3 report for the automated tests
  • Update documentation as appropriate (e.g README.md, Architecture.md, CHANGELOG.md, etc.)
  • Run the app and try the changes
  • Pull in the latest changes from the main branch and squash your commits before assigning a reviewer4

Note
It is good practice to provide before and after UI screenshots in the description of this PR. This is only applicable for changes that modify the UI.

Reviewer

  • Check the code with the Code Review Guidelines checklist
  • Perform an ad hoc review5
  • Review the automated tests
  • Review the manual tests
  • Review the documentation, README.md, Architecture.md, etc. as appropriate
  • Run the app and try the changes6

Footnotes

  1. Code often looks different when reviewing the diff in a browser, making it easier to spot potential bugs.

  2. While we aim for automated testing of the application, some aspects require manual testing. If you had to manually test something during development of this pull request, write those steps down.

  3. While we are not looking for perfect coverage, the tool can point out potential cases that have been missed. Code coverage can be generated with: ./gradlew check for Kotlin modules and ./gradlew connectedCheck -PIS_ANDROID_INSTRUMENTATION_TEST_COVERAGE_ENABLED=true for Android modules.

  4. Having your code up to date and squashed will make it easier for others to review. Use best judgement when squashing commits, as some changes (such as refactoring) might be easier to review as a separate commit.

  5. In addition to a first pass using the code review guidelines, do a second pass using your best judgement and experience which may identify additional questions or comments. Research shows that code review is most effective when done in multiple passes, where reviewers look for different things through each pass.

  6. While the CI server runs the app to look for build failures or crashes, humans running the app are more likely to notice unexpected log messages, UI inconsistencies, or bad output data. Perform this step last, after verifying the code changes are safe to run locally.

@Milan-Cerovsky Milan-Cerovsky self-assigned this Sep 16, 2024
Copy link
Collaborator

@HonzaR HonzaR left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you for these changes! I'm sharing a few first ideas in the comments.

@@ -135,6 +135,7 @@ dependencyResolutionManagement {
}
}
}
mavenLocal()
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why do we need this change, please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

flexa is not on maven, I am instead building their sdk locally lol

@@ -122,6 +131,9 @@ dependencies {
implementation(libs.zcash.bip39)
implementation(libs.zxing)

api("com.flexa:core:1.0.1")
api("com.flexa:spend:1.0.1")
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we use the same dependency approach as we do elsewhere, injecting them via settings.gradle?

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What's the reason for creating a new preference provider and not using the existing one, e.g., EncryptedPreferenceProvider?


interface BalanceRepository {
/**
* A flow of the wallet balances state used for the UI layer. It's computed form [WalletSnapshot]'s properties
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Typo form -> from

private suspend fun createFlexaAccount(zecBalance: Double) =
AppAccount(
accountId = getFlexaAccountId(),
displayName = "My Wallet",
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this our preferred displayName value for each user?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I dont know yet :D

@@ -112,7 +112,6 @@ private fun HomeContent(
key = { index ->
subScreens[index].title
},
beyondBoundsPageCount = 1,
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is the intention behind this change, please?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Flexa uses newer material 3 -> and we see it transitively. We need to exclude it probably


when {
appId.isEmpty() && isDebug ->
coinbaseNavigationCommand.emit("https://www.coinbase.com") // fallback debug url
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can we move these hardcoded urls to constants?

<string name="integrations_coinbase_subtitle">A hassle-free way to buy <xliff:g id="currency" example="ZEC">%1$s</xliff:g> and get it directly into your Zashi wallet.</string>
<string name="integrations_flexa">Pay with Flexa</string>
<string name="integrations_flexa_subtitle">Pay with Flexa payment clips and explore a new way of spending Zcash.</string>
<string name="integrations_version">Version %s</string>
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Let's use xliff instead here.

# Conflicts:
#	ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/component/ZashiSettingsListItem.kt
#	ui-design-lib/src/main/java/co/electriccoin/zcash/ui/design/theme/ZashiColors.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/di/RepositoryModule.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/di/UseCaseModule.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/di/ViewModelModule.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/ui/Navigation.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/AdvancedSettingsState.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/view/AdvancedSettingsView.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/advancedsettings/viewmodel/AdvancedSettingsViewModel.kt
#	ui-lib/src/main/java/co/electriccoin/zcash/ui/screen/settings/view/SettingsView.kt
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Flexa Integration
2 participants