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

Satscard Integration (Android) #26

Merged
merged 17 commits into from
Dec 11, 2023

Conversation

PeteClubSeven
Copy link
Contributor

Hey, as part of the Satscard bounty these are the strings I added. I believe @kingonly wanted to review these and make some modifications

Note: 60e316b will stop future problems where generating the translation texts causes English to no longer be the default locale when a users device is set to an unsupported locale.

@kingonly
Copy link
Member

kingonly commented Dec 6, 2023

@PeteClubSeven I sent a few changes via email

@PeteClubSeven
Copy link
Contributor Author

@PeteClubSeven I sent a few changes via email

Done, let me know if you want any further changes

@PeteClubSeven PeteClubSeven changed the title Satscard Integration Satscard Integration (Android) Dec 6, 2023
Copy link
Contributor

@ubbabeck ubbabeck left a comment

Choose a reason for hiding this comment

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

Thanks looks good to me.

Why did you specify android, is there a reason for us to need alternaltive translations for iOS?

l10n.yaml Show resolved Hide resolved
test/breez_translations_test.dart Show resolved Hide resolved
@ademar111190
Copy link
Collaborator

@kingonly are the changes addressed?

@PeteClubSeven
Copy link
Contributor Author

Thanks looks good to me.

Why did you specify android, is there a reason for us to need alternaltive translations for iOS?

Due to the differences in NFC on Android vs iOS there will likely be a couple of iOS-specific strings. From what I could tell NFC support in the iOS version of the app only exists in the PoS page and is activated by pressing an NFC icon. I was considering adding a new option to the "Receive" option list to allow the user to scan NFC cards on the home page on iOS. On Android this is unnecessary because we have NFC scanning on at all times.

@PeteClubSeven
Copy link
Contributor Author

@ademar111190 @ubbabeck I added one additional dialog because I replaced the auto-closing "Broadcast Transaction" page with a pop up when the Satscard is successfully swept

@ademar111190
Copy link
Collaborator

I'm merging the PR.

If there are changes from @kingonly not addressed yet we can open a new PR later.

@ademar111190 ademar111190 merged commit 1bf53ec into breez:main Dec 11, 2023
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.

4 participants