Skip to content

Commit 7d8dd14

Browse files
josikiekcw-gruntandhikayuanaJosephSanjaya
authored
Redesign welcome screen (#123)
* Redesign welcome screen * Redesign ready screen * 🚀[Release v4.7.2] Merge into Develop (#127) * 🚀[Release v4.4.7] Merge into Main (#70) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.5.0] Merge into Main (#78) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.5.4] Merge into Main (#87) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * Updated README * code bump * chore: open bread activity first then open moonpay widget (#88) * code bump --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.5.5] Merge into Main (#101) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * chore: open bread activity first then open moonpay widget (#88) * Adjustment for circleci (#89) * chore: wip adjustment for screengrab * chore: [circleci] adjust config.yml * chore: [circleci] update config.yml, Fastfile, Gemfile.lock, RecoverWalletScreenGrabsTest.kt * chore: [circleci] for now just unit-test * fix: android: Footer version label is obfuscated (#92) * fix: android: Footer version label is obfuscated * fix: [#92] android: Footer version label is obfuscated * fix: You saved it right screen reset button covers words (#93) * fix: [#84] change seed words layout to lazy vertical grid * fix: [#84] refactor seed words layout * tiny resizing (#94) * code and version bump * change break (#97) adds a android user agent and externalID * build code number fix: [#96] remove bottom_nav_menu_us and just using bottom_nav_menu for consistency (#98) * fix: [#137] fix: Reset fiat options in Buy / Receive modal (#99) * Chore/update device data (#100) * change break adds a android user agent and externalID * Update ReceiveDialogViewModel.kt * chore: refactor request params for fetchMoonpaySignedUrl --------- Co-authored-by: andhikayuana <[email protected]> * Update build.gradle.kts --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.6.0] Merge into Main (#104) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * chore: open bread activity first then open moonpay widget (#88) * Adjustment for circleci (#89) * chore: wip adjustment for screengrab * chore: [circleci] adjust config.yml * chore: [circleci] update config.yml, Fastfile, Gemfile.lock, RecoverWalletScreenGrabsTest.kt * chore: [circleci] for now just unit-test * fix: android: Footer version label is obfuscated (#92) * fix: android: Footer version label is obfuscated * fix: [#92] android: Footer version label is obfuscated * fix: You saved it right screen reset button covers words (#93) * fix: [#84] change seed words layout to lazy vertical grid * fix: [#84] refactor seed words layout * tiny resizing (#94) * code and version bump * change break (#97) adds a android user agent and externalID * build code number fix: [#96] remove bottom_nav_menu_us and just using bottom_nav_menu for consistency (#98) * fix: [#137] fix: Reset fiat options in Buy / Receive modal (#99) * Chore/update device data (#100) * change break adds a android user agent and externalID * Update ReceiveDialogViewModel.kt * chore: refactor request params for fetchMoonpaySignedUrl --------- Co-authored-by: andhikayuana <[email protected]> * Add agent string obfuscation (#103) * version bump * code bump --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.6.1] Merge into Main (#107) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * chore: open bread activity first then open moonpay widget (#88) * Adjustment for circleci (#89) * chore: wip adjustment for screengrab * chore: [circleci] adjust config.yml * chore: [circleci] update config.yml, Fastfile, Gemfile.lock, RecoverWalletScreenGrabsTest.kt * chore: [circleci] for now just unit-test * fix: android: Footer version label is obfuscated (#92) * fix: android: Footer version label is obfuscated * fix: [#92] android: Footer version label is obfuscated * fix: You saved it right screen reset button covers words (#93) * fix: [#84] change seed words layout to lazy vertical grid * fix: [#84] refactor seed words layout * tiny resizing (#94) * code and version bump * change break (#97) adds a android user agent and externalID * build code number fix: [#96] remove bottom_nav_menu_us and just using bottom_nav_menu for consistency (#98) * fix: [#137] fix: Reset fiat options in Buy / Receive modal (#99) * Chore/update device data (#100) * change break adds a android user agent and externalID * Update ReceiveDialogViewModel.kt * chore: refactor request params for fetchMoonpaySignedUrl --------- Co-authored-by: andhikayuana <[email protected]> * Add agent string obfuscation (#103) * updated metadata (#105) * chore: remove screen lock detection (#106) * build bump --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.6.2] Merge into Main (#110) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * chore: open bread activity first then open moonpay widget (#88) * Adjustment for circleci (#89) * chore: wip adjustment for screengrab * chore: [circleci] adjust config.yml * chore: [circleci] update config.yml, Fastfile, Gemfile.lock, RecoverWalletScreenGrabsTest.kt * chore: [circleci] for now just unit-test * fix: android: Footer version label is obfuscated (#92) * fix: android: Footer version label is obfuscated * fix: [#92] android: Footer version label is obfuscated * fix: You saved it right screen reset button covers words (#93) * fix: [#84] change seed words layout to lazy vertical grid * fix: [#84] refactor seed words layout * tiny resizing (#94) * code and version bump * change break (#97) adds a android user agent and externalID * build code number fix: [#96] remove bottom_nav_menu_us and just using bottom_nav_menu for consistency (#98) * fix: [#137] fix: Reset fiat options in Buy / Receive modal (#99) * Chore/update device data (#100) * change break adds a android user agent and externalID * Update ReceiveDialogViewModel.kt * chore: refactor request params for fetchMoonpaySignedUrl --------- Co-authored-by: andhikayuana <[email protected]> * Add agent string obfuscation (#103) * updated metadata (#105) * chore: remove screen lock detection (#106) * changed to tap * Added instruction label -added localizations * Added 'empty string for when confirm is completed * version and code bump * fix typo replaced click file with mp3 added error sound * added 3 languages * 🧰 Fx/seed words UI polish (#108) * changed to tap * Added instruction label -added localizations * Added 'empty string for when confirm is completed * version and code bump * fix typo replaced click file with mp3 added error sound * Removed unused audio files * polished tests * removed unused asset pack * code bump * code bump * ❇️ Feat/add polish punjabi farsi (#109) * changed to tap * Added instruction label -added localizations * Added 'empty string for when confirm is completed * version and code bump * fix typo replaced click file with mp3 added error sound * added 3 languages * Removed unused audio files * polished tests * removed unused asset pack * code bump * broke out completion of the seed phrase and navigation - Feedback was a user could complete seed phrase and not tap "Game and Sync" - Forced users to start all over - Saved a correct seed phrase confirmation into memory * code bump * fix for https://console.firebase.google.com/project/brainwallet-mobile/crashlytics/app/android:ltd.grunt.brainwallet/issues/1386f366ab35e9112a6b742d629bb0be?time=last-seven-days&types=crash&sessionEventKey=685DA96C00BF00015A7AFEA30E0DB49C_2098799426616143441 * measure where users tap * code bump * fix: fix YourSeedProveItState.isWordUsedCorrectly * Cleaned commented out BuyLitecoinscreen * code bump --------- Co-authored-by: andhikayuana <[email protected]> * 🚀[Release v4.7.0] Merge into Main (#115) * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * Add version and code to welcome screen * reset padding * Revert "Updated the APIManager" This reverts commit 4e252ac29cfb6c3ab26ae5ea4a8f6de154311f2e. # Conflicts: # app/src/main/java/com/brainwallet/tools/manager/APIManager.kt * Reverted the Kotlin APIManager. * fix: fix crash when FragmentSignal dismissed * fix: fix sync after wipe * fix: fix wrong lifecycle to trigger callback at FragmentSignal * Update issue templates * updated core changes per @andhikayuana * Rename .java to .kt * chore: refactor BRApiManager & APIClient * chore: remove unused part at APIClient * feat: wip new peer discovery * feat: implement selected peer ip address from cache (fetched from API) * feat: implement selected peer ip address from cache (fetched from API) * feat: filter out peers with NODE_NETWORK, NODE_BLOOM * fix: race condition when clear shared prefs values after wipeAll * Updating the core library from the new peer discovery (v4.2.0) * Chore/revert pre peer discovery (Android) (#69) * chore: update core submodule * chore: resolve conflict * Update build.gradle.kts version and code bump * chore: for now at BRPeerManager.wrapConnectV2 only using connect, since the core using hardcoded peers * fix: fix write down confirm screen (#63) * fix: fix write down confirm screen * fix: fix allow seed word item not unique * chore: cherry picked and adjust from - f2fa8e1e4fb9c7429fa86461b24b4463a7969ecf - 98644c425b2fdae7b8b424708fb1a61ad983a9d8 - 93969278da8f95adc0c9f0f8411c8a27876a4d77 - 7ad4b9853b7d1bf7ddbaa576242d8800615a48fb - 8e57d2a67420565b40b753dec5a533776da4821f * fix: fix crash can't parse response inside LtcRepository.fetchRates * fix: fix crash (failed parse) when SelectedPeersRepository.fetchSelectedPeers got unsuccessful response * code bump * fix: ConcurrentModificationException at BRPeerManager.txStatusUpdate * feat: implement new API * code bump --------- Co-authored-by: Kerry Washington <[email protected]> * feat: remove unused activity (ImportActivity) at AndroidManifest.xml (#71) * fix: fix crash IllegalStateException: cannot make a new request because the previous response is still open (#73) * code bump * Feat/move tx fee (#74) * chore: add new translations at strings.xml * feat: move network fee to HomeSettingDrawerSheet & remove unused code * fix: fix dismiss allow state loss (#76) * fix: fix typo at strings.xml (#75) * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * version and code bump * Added support url (#81) - changed the language - code bump * version and code bump * Revert from eda0f532 & cherry pick (#86) * version bump * feat: new UI for receive and topup flow (moonpay integration) (#72) * feat: [WIP][UI] new UI for receive and topup flow * feat: [WIP][UI] implement copy address and some refactor * feat: replace webview using CustomTabsIntent from androidx.browser * feat: replace webview using CustomTabsIntent from androidx.browser * feat: add PickerWheel * chore: rename param at QRUtils.generateQR * chore: revert default startDestination at BrainwalletActivity * feat: wip moonpay integration * feat: wip moonpay integration * chore: new UI for ReceiveDialog * chore: parse error from response API at BrainwalletViewModel * chore: add /moonpay/buy-quote and remove dev base url * chore: make LegacyNavigation.showMoonPayWidget receive params for the widget url * chore: add GetMoonpayBuyQuoteResponse * chore: wip moonpay integration to call buy-quote * fix: fix wheel picker for IDR at ReceiveDialog * fix: fix invalid signature * feat: moonpay integration at onboarding flow at BuyLitecoinScreen also fix some stuffs * chore: replace base url for moonpay buy integration when debug * chore: introduce LocalCacheSource.kt and cache fetch limits * chore: adjustment receive dialog UI - debounce fiat currency to 2s - increment in 10 - remove decimal places - default value to 10% of range * chore: reorder bottom navigation item and add new strings * chore: add new translations * chore: refactor UI for buy and receive dialog * chore: cleanup ReceiveDialogViewModel * chore: using MoonpayBuyWidget * chore: adjustment moonpaywidget * chore: for now moonpay widget using CustomTabsIntent * chore: set allowSpend to false when recommend rescan click * fix: add delete transaction data from local database * Removed chatty event * chore: add analytics at BRWalletManager.publishCallback * chore: make sure calculation and static fee same as iOS, add setting for selected fee type --------- Co-authored-by: Kerry Washington <[email protected]> * build bump * chore: open bread activity first then open moonpay widget (#88) * Adjustment for circleci (#89) * chore: wip adjustment for screengrab * chore: [circleci] adjust config.yml * chore: [circleci] update config.yml, Fastfile, Gemfile.lock, RecoverWalletScreenGrabsTest.kt * chore: [circleci] for now just unit-test * fix: android: Footer version label is obfuscated (#92) * fix: android: Footer version label is obfuscated * fix: [#92] android: Footer version label is obfuscated * fix: You saved it right screen reset button covers words (#93) * fix: [#84] change seed words layout to lazy vertical grid * fix: [#84] refactor seed words layout * tiny resizing (#94) * code and version bump * change break (#97) adds a android user agent and externalID * build code number fix: [#96] remove bottom_nav_menu_us and just using bottom_nav_menu for consistency (#98) * fix: [#137] fix: Reset fiat options in Buy / Receive modal (#99) * Chore/update device data (#100) * change break adds a android user agent and externalID * Update ReceiveDialogViewModel.kt * chore: refactor request params for fetchMoonpaySignedUrl --------- Co-authored-by: andhikayuana <[email protected]> * Add agent string obfuscation (#103) * updated metadata (#105) * chore: remove screen lock detection (#106) * 🧰 Fx/seed words UI polish (#108) * changed to tap * Added instruction label -added localizations * Added 'empty string for when confirm is completed * version and code bump * fix typo replaced click file with mp3 added error sound * ❇️ Feat/add polish punjabi farsi (#109) * changed to tap * Added instruction label -added localizations * Added 'empty string for when confirm is completed * version and code bump * fix typo replaced click file with mp3 added error sound * added 3 languages * Removed unused audio files * polished tests * removed unused asset pack * code bump * fix: fix YourSeedProveItState.isWordUsedCorrectly (#111) * Upgrade targetSdk 36 (#113) * chore: change drawable with density for brainwallet_logotype_white * chore: adjustment WelcomeScreen.kt * chore: adjustment for targetSdk 36 also support 16KB page size * bump clean extra semicolon * Update pro-guard-rules * Updated the version --------- Co-authored-by: andhikayuana <[email protected]> * Updated games module to v1.1.0 * Updated the games submodule * Renamed and tested with user skips --------- Co-authored-by: andhikayuana <[email protected]> * Fix(#227): Crash when launching MoonPay Widget (#126) Refactored the MoonPay widget integration to a dedicated Composable (`MoonPayWidgetLauncher`) to ensure proper state handling and loading behavior. - Added `MoonPayWidgetLauncher.kt` with Composable and ViewModel for managing signed URL fetch and Custom Tab launch. - Ensures loading state covers the whole screen, preventing UI crashes. - Removed legacy static method `LegacyNavigation.showMoonPayWidget`. - Updated `ReceiveDialog.kt` and `BuyLitecoinScreen.kt` to use the new Composable. - Minor cleanup in `LegacyNavigation.kt`. * feat(#138): Improve Unlock Screen UI and add dark mode toggle (#122) --------- Co-authored-by: Kerry Washington <[email protected]> Co-authored-by: andhikayuana <[email protected]> Co-authored-by: Joseph Sanjaya <[email protected]>
1 parent e0aebb5 commit 7d8dd14

File tree

22 files changed

+112
-113
lines changed

22 files changed

+112
-113
lines changed

app/src/main/java/com/brainwallet/ui/screens/ready/ReadyScreen.kt

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,10 @@ fun ReadyScreen(
5555
}
5656

5757
/// Layout values
58-
val leadingCopyPadding = 16
58+
val leadingCopyPadding = 18
5959

6060
val horizontalVerticalSpacing = 8
61-
val spacerHeight = 90
61+
val spacerHeight = 40
6262

6363
val activeRowHeight = 70
6464

@@ -89,7 +89,7 @@ fun ReadyScreen(
8989
horizontalAlignment = Alignment.CenterHorizontally,
9090
verticalArrangement = Arrangement.spacedBy(horizontalVerticalSpacing.dp),
9191
) {
92-
Spacer(modifier = Modifier.weight(1f))
92+
Spacer(modifier = Modifier.weight(0.5f))
9393
Row {
9494
Icon(
9595
Icons.AutoMirrored.Filled.ArrowForward,
@@ -101,28 +101,27 @@ fun ReadyScreen(
101101
scaleY = 2f
102102
)
103103
)
104-
Spacer(modifier = Modifier.weight(1f))
104+
Spacer(modifier = Modifier.weight(0.3f))
105105
}
106106

107+
Spacer(modifier = Modifier.height(16.dp))
108+
107109
Text(
108110
text = stringResource(R.string.ready_setup),
109111
style = MaterialTheme.typography.displaySmall.copy(textAlign = TextAlign.Left),
110-
modifier = Modifier.fillMaxWidth()
112+
modifier = Modifier.fillMaxWidth(),
113+
fontWeight = FontWeight.Bold
111114
)
112115

113116
Text(
114117
text = buildAnnotatedString {
115118
append(stringResource(R.string.ready_setup_details_1))
116-
append(" ")
117-
withStyle(
118-
style = SpanStyle(
119-
fontWeight = FontWeight.Bold,
120-
)
121-
) {
122-
append(stringResource(R.string.ready_setup_details_2))
119+
append("\n\n")
120+
append(stringResource(R.string.ready_setup_details_2))
121+
append("\n\n")
122+
withStyle(style = SpanStyle(fontWeight = FontWeight.Bold)) {
123+
append(stringResource(R.string.ready_setup_details_3))
123124
}
124-
append(". ")
125-
append(stringResource(R.string.ready_setup_details_3))
126125
},
127126
style = MaterialTheme.typography.bodyLarge,
128127
modifier = Modifier.fillMaxWidth()

app/src/main/java/com/brainwallet/ui/screens/welcome/WelcomeScreen.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -205,7 +205,7 @@ fun WelcomeScreen(
205205

206206
) {
207207
Text(
208-
text = stringResource(R.string.ready),
208+
text = stringResource(R.string.MenuViewController_createButton),
209209
fontSize = buttonFontSize.sp,
210210
fontWeight = FontWeight.SemiBold,
211211
)

app/src/main/res/values-ar/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,10 @@
386386
<string name="you_saved_it_right">لقد أنقذته، أليس كذلك؟</string>
387387
<string name="you_saved_it_right_desc">أثبت ذلك!\nاسحب الكلمات بالترتيب الصحيح.</string>
388388
<string name="game_and_sync">اللعبة والمزامنة</string>
389-
<string name="ready_setup">مستعد؟</string>
390-
<string name="ready_setup_details_1">افعل هذا من أجلك. من فضلك افعلها</string>
391-
<string name="ready_setup_details_2">وحيد</string>
392-
<string name="ready_setup_details_3">أحضر قلمًا وورقة و5 دقائق</string>
389+
<string name="ready_setup">؟هل أنت مستعد للبدء؟</string>
390+
<string name="ready_setup_details_1">هذا لك وحدك.</string>
391+
<string name="ready_setup_details_2">قم بإعداد رمز مرور التطبيق، ثم افتح مدير كلمات المرور الخاص بك أو استخدم قلمًا لتسجيله وعبارة البذرة الجديدة.</string>
392+
<string name="ready_setup_details_3">نحن لا نعرفه وليس لدينا نسخة منه!</string>
393393
<string name="setup_app_passcode">رمز مرور تطبيق الإعداد</string>
394394
<string name="setup_app_details_1">اختر رمز مرور لفتح Brainwallet الخاص بك</string>
395395
<string name="setup_app_details_2">ليس رمز قفل الهاتف!</string>
@@ -406,7 +406,7 @@
406406
<string name="confirm">يتأكد</string>
407407
<string name="confirm_desc">أنت لم تنسى أليس كذلك؟ أدخله مرة أخرى. أو، العودة للبدء من جديد.</string>
408408
<string name="ready">مستعد</string>
409-
<string name="restore">يعيد</string>
409+
<string name="restore">استعادة باستخدام عبارة البذور</string>
410410
<string name="incorrect_passcode">رمز المرور غير صحيح، يرجى المحاولة مرة أخرى!</string>
411411
<string name="down_left_arrow">سهم لأسفل لليسار</string>
412412
<string name="logo">شعار</string>

app/src/main/res/values-de/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,10 @@
748748
<string name="you_saved_it_right">Du hast es gespeichert, oder?</string>
749749
<string name="you_saved_it_right_desc">Beweisen Sie es!\nZiehen Sie die Wörter in die richtige Reihenfolge.</string>
750750
<string name="game_and_sync">Spiel &amp; Synchronisierung</string>
751-
<string name="ready_setup">Bereit?</string>
752-
<string name="ready_setup_details_1">Tun Sie dies für Sie. Bitte tun Sie es</string>
753-
<string name="ready_setup_details_2">allein</string>
754-
<string name="ready_setup_details_3">Schnappen Sie sich einen Stift, Papier und 5 Minuten</string>
751+
<string name="ready_setup">Bereit zum Start?</string>
752+
<string name="ready_setup_details_1">Das ist nur für dich.</string>
753+
<string name="ready_setup_details_2">Richten Sie den App-Passcode ein, öffnen Sie Ihren Passwort-Manager oder nehmen Sie einen Stift, um ihn und Ihre neue Seed-Phrase aufzuzeichnen.</string>
754+
<string name="ready_setup_details_3">Wir kennen es nicht und haben auch keine Kopie!</string>
755755
<string name="setup_app_passcode">App-Passcode einrichten</string>
756756
<string name="setup_app_details_1">Wählen Sie einen Passcode, um Ihr Brainwallet zu entsperren</string>
757757
<string name="setup_app_details_2">Kein Telefonsperrcode!</string>
@@ -768,7 +768,7 @@
768768
<string name="confirm">Bestätigen</string>
769769
<string name="confirm_desc">Du hast es nicht vergessen, oder? Geben Sie es erneut ein. Oder gehen Sie zurück, um von vorne zu beginnen.</string>
770770
<string name="ready">Bereit</string>
771-
<string name="restore">Wiederherstellen</string>
771+
<string name="restore">Mit Seed-Phrase wiederherstellen</string>
772772
<string name="incorrect_passcode">Falscher Passcode, bitte versuchen Sie es erneut!</string>
773773
<string name="down_left_arrow">Pfeil nach unten links</string>
774774
<string name="logo">Logo</string>

app/src/main/res/values-es/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -747,10 +747,10 @@
747747
<string name="you_saved_it_right">Lo guardaste, ¿verdad?</string>
748748
<string name="you_saved_it_right_desc">¡Pruébalo!\nArrastra las palabras en el orden correcto.</string>
749749
<string name="game_and_sync">Juego y sincronización</string>
750-
<string name="ready_setup">¿Listo?</string>
751-
<string name="ready_setup_details_1">Haz esto por ti. por favor hazlo</string>
752-
<string name="ready_setup_details_2">solo</string>
753-
<string name="ready_setup_details_3">Coge bolígrafo, papel y 5 minutos.</string>
750+
<string name="ready_setup">¿Listo para empezar?</string>
751+
<string name="ready_setup_details_1">Esto es solo para ti.</string>
752+
<string name="ready_setup_details_2">Configura el código de acceso de la aplicación, abre tu administrador de contraseñas o toma un bolígrafo para registrarlo junto con tu nueva frase inicial.</string>
753+
<string name="ready_setup_details_3">¡No lo sabemos ni tenemos copia!</string>
754754
<string name="setup_app_passcode">Configurar el código de acceso de la aplicación</string>
755755
<string name="setup_app_details_1">Elija una contraseña para desbloquear su Brainwallet</string>
756756
<string name="setup_app_details_2">¡No es un código de bloqueo del teléfono!</string>
@@ -767,7 +767,7 @@
767767
<string name="confirm">Confirmar</string>
768768
<string name="confirm_desc">No lo olvidaste ¿verdad? Ingrese nuevamente. O regrese para empezar de nuevo.</string>
769769
<string name="ready">Listo</string>
770-
<string name="restore">Restaurar</string>
770+
<string name="restore">Restaurar con frase semilla</string>
771771
<string name="incorrect_passcode">Código de acceso incorrecto, ¡inténtelo de nuevo!</string>
772772
<string name="down_left_arrow">flecha abajo-izquierda</string>
773773
<string name="logo">logo</string>

app/src/main/res/values-fa/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -777,10 +777,10 @@
777777
<string name="you_saved_it_right_desc">اثباتش کن!
778778
کلمات را به ترتیب صحیح بکشید.</string>
779779
<string name="game_and_sync">بازی و همگام‌سازی</string>
780-
<string name="ready_setup">آماده‌اید؟</string>
781-
<string name="ready_setup_details_1">برای شما انجام می‌دهم. لطفاً انجامش بده</string>
782-
<string name="ready_setup_details_2">تنها</string>
783-
<string name="ready_setup_details_3">یک قلم، کاغذ و ۵ دقیقه بردارید</string>
780+
<string name="ready_setup">آماده برای شروع؟</string>
781+
<string name="ready_setup_details_1">این فقط برای توئه.</string>
782+
<string name="ready_setup_details_2">کد عبور برنامه را تنظیم کنید، مدیر رمز عبور خود را باز کنید یا یک خودکار بردارید و آن و عبارت بازیابی جدید خود را یادداشت کنید.</string>
783+
<string name="ready_setup_details_3">ما نه آن را می‌شناسیم و نه نمونه‌ای از آن داریم!</string>
784784
<string name="setup_app_passcode">تنظیم رمز عبور برنامه</string>
785785
<string name="setup_app_details_1">یک رمز عبور را برای باز کردن قفل کیف پول مغزی خود انتخاب کنید</string>
786786
<string name="setup_app_details_2">قفل تلفن نیست!</string>
@@ -803,7 +803,7 @@
803803
<string name="confirm">تایید</string>
804804
<string name="confirm_desc">فراموش نکردی، مگه نه؟ وارد کنید دوباره. یا، به عقب برگردید تا از ابتدا شروع کنید.</string>
805805
<string name="ready">آماده</string>
806-
<string name="restore">بازیابی</string>
806+
<string name="restore">بازیابی با عبارت Seed</string>
807807
<string name="incorrect_passcode">رمز عبور نادرست، لطفاً دوباره تلاش کنید!</string>
808808
<string name="down_left_arrow">فلش به سمت پایین و چپ</string>
809809
<string name="logo">لوگو</string>

app/src/main/res/values-fr/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,10 @@
748748
<string name="you_saved_it_right">Vous l\'avez sauvegardé, n\'est-ce pas ?</string>
749749
<string name="you_saved_it_right_desc">Prouvez-le !\nFaites glisser les mots dans le bon ordre.</string>
750750
<string name="game_and_sync">Jeu et synchronisation</string>
751-
<string name="ready_setup">Prêt?</string>
752-
<string name="ready_setup_details_1">Faites cela pour vous. S\'il te plaît, fais-le</string>
753-
<string name="ready_setup_details_2">seul</string>
754-
<string name="ready_setup_details_3">Prenez un stylo, du papier et 5 minutes</string>
751+
<string name="ready_setup">Prêt à commencer?</string>
752+
<string name="ready_setup_details_1">Ceci est pour toi seul.</string>
753+
<string name="ready_setup_details_2">Configurez le mot de passe de l\'application, ouvrez votre gestionnaire de mots de passe ou prenez un stylo pour l\'enregistrer ainsi que votre nouvelle phrase de départ.</string>
754+
<string name="ready_setup_details_3">Nous ne le savons pas et n’en avons pas de copie !</string>
755755
<string name="setup_app_passcode">Configurer le mot de passe de l\'application</string>
756756
<string name="setup_app_details_1">Choisissez un mot de passe pour déverrouiller votre Brainwallet</string>
757757
<string name="setup_app_details_2">Pas un code de verrouillage du téléphone !</string>
@@ -768,7 +768,7 @@
768768
<string name="confirm">Confirmer</string>
769769
<string name="confirm_desc">Vous n\'avez pas oublié, n\'est-ce pas ? Entrez-le à nouveau. Ou revenez en arrière pour recommencer.</string>
770770
<string name="ready">Prêt</string>
771-
<string name="restore">Restaurer</string>
771+
<string name="restore">Restaurer avec une phrase de départ</string>
772772
<string name="incorrect_passcode">Code d\'accès incorrect, veuillez réessayer !</string>
773773
<string name="down_left_arrow">flèche bas-gauche</string>
774774
<string name="logo">logo</string>

app/src/main/res/values-hi/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -386,10 +386,10 @@
386386
<string name="you_saved_it_right">आपने इसे सहेज लिया, है ना?</string>
387387
<string name="you_saved_it_right_desc">इसे साबित करें!\nशब्दों को सही क्रम में खींचें।</string>
388388
<string name="game_and_sync">गेम और सिंक</string>
389-
<string name="ready_setup">तैयार?</string>
390-
<string name="ready_setup_details_1">यह आपके लिए करें. कृपया इसे करते हैं</string>
391-
<string name="ready_setup_details_2">अकेला</string>
392-
<string name="ready_setup_details_3">एक कलम, कागज़ और 5 मिनट पकड़ें</string>
389+
<string name="ready_setup">शुरू करने के लिए तैयार हैं?</string>
390+
<string name="ready_setup_details_1">यह केवल आपके लिए है.</string>
391+
<string name="ready_setup_details_2">ऐप पासकोड सेट करें, अपना पासवर्ड मैनेजर खोलें या इसे और अपने नए बीज वाक्यांश को रिकॉर्ड करने के लिए एक पेन लें।</string>
392+
<string name="ready_setup_details_3">हमें इसकी जानकारी नहीं है और न ही हमारे पास इसकी कोई प्रति है!</string>
393393
<string name="setup_app_passcode">ऐप पासकोड सेटअप करें</string>
394394
<string name="setup_app_details_1">अपने ब्रेनवॉलेट को अनलॉक करने के लिए एक पासकोड चुनें</string>
395395
<string name="setup_app_details_2">फ़ोन लॉक कोड नहीं!</string>
@@ -406,7 +406,7 @@
406406
<string name="confirm">पुष्टि करना</string>
407407
<string name="confirm_desc">तुम भूले तो नहीं? इसे दोबारा दर्ज करें. या, दोबारा शुरू करने के लिए वापस जाएं।</string>
408408
<string name="ready">तैयार</string>
409-
<string name="restore">पुनर्स्थापित करना</string>
409+
<string name="restore">बीज वाक्यांश के साथ पुनर्स्थापित करें</string>
410410
<string name="incorrect_passcode">ग़लत पासकोड, कृपया पुनः प्रयास करें!</string>
411411
<string name="down_left_arrow">नीचे-बाएँ-तीर</string>
412412
<string name="logo">प्रतीक चिन्ह</string>

app/src/main/res/values-in/strings.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -750,10 +750,10 @@
750750
<string name="you_saved_it_right">Anda menyimpannya, kan?</string>
751751
<string name="you_saved_it_right_desc">Buktikan!\nSeret kata-kata dalam urutan yang benar.</string>
752752
<string name="game_and_sync">Permainan &amp; Sinkronisasi</string>
753-
<string name="ready_setup">Siap?</string>
753+
<string name="ready_setup">Siap untuk memulai?</string>
754754
<string name="ready_setup_details_1">Lakukan ini untukmu. Tolong lakukan itu</string>
755-
<string name="ready_setup_details_2">sendiri</string>
756-
<string name="ready_setup_details_3">Ambil pena, kertas, dan 5 menit</string>
755+
<string name="ready_setup_details_2">Atur kode sandi aplikasi, buka pengelola kata sandi Anda atau ambil pena untuk mencatatnya &amp; frasa benih baru Anda.</string>
756+
<string name="ready_setup_details_3">Kami tidak mengetahuinya dan kami tidak memiliki salinannya!</string>
757757
<string name="setup_app_passcode">Siapkan kode sandi aplikasi</string>
758758
<string name="setup_app_details_1">Pilih kode sandi untuk membuka kunci Brainwallet Anda</string>
759759
<string name="setup_app_details_2">Bukan kode kunci telepon!</string>
@@ -770,7 +770,7 @@
770770
<string name="confirm">Mengonfirmasi</string>
771771
<string name="confirm_desc">Kamu tidak lupa kan? Masukkan lagi. Atau, kembali untuk memulai kembali.</string>
772772
<string name="ready">Siap</string>
773-
<string name="restore">Memulihkan</string>
773+
<string name="restore">Pulihkan dengan Seed Phrase</string>
774774
<string name="incorrect_passcode">Kode Sandi salah, silakan coba lagi!</string>
775775
<string name="down_left_arrow">panah kiri bawah</string>
776776
<string name="logo">logo</string>

app/src/main/res/values-it/strings.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -748,10 +748,10 @@
748748
<string name="you_saved_it_right">L\'hai salvato, vero?</string>
749749
<string name="you_saved_it_right_desc">Dimostralo!\nTrascina le parole nell\'ordine corretto.</string>
750750
<string name="game_and_sync">Gioco e sincronizzazione</string>
751-
<string name="ready_setup">Pronto?</string>
752-
<string name="ready_setup_details_1">Fallo per te. Per favore, fallo</string>
753-
<string name="ready_setup_details_2">solo</string>
754-
<string name="ready_setup_details_3">Prendi carta, penna e 5 minuti</string>
751+
<string name="ready_setup">Pronto per iniziare?</string>
752+
<string name="ready_setup_details_1">Questo è solo per te.</string>
753+
<string name="ready_setup_details_2">Imposta il codice di accesso dell\'app, apri il tuo gestore di password o prendi una penna per registrarlo insieme alla tua nuova frase seed.</string>
754+
<string name="ready_setup_details_3">Non lo sappiamo e non ne abbiamo una copia!</string>
755755
<string name="setup_app_passcode">Imposta il codice di accesso dell\'app</string>
756756
<string name="setup_app_details_1">Scegli un passcode per sbloccare il tuo Brainwallet</string>
757757
<string name="setup_app_details_2">Non è un codice di blocco del telefono!</string>
@@ -768,7 +768,7 @@
768768
<string name="confirm">Confermare</string>
769769
<string name="confirm_desc">Non te ne sei dimenticato, vero? Inseriscilo di nuovo. Oppure torna indietro per ricominciare da capo.</string>
770770
<string name="ready">Pronto</string>
771-
<string name="restore">Ripristinare</string>
771+
<string name="restore">Ripristina con la frase Seed</string>
772772
<string name="incorrect_passcode">Codice di accesso errato, riprova!</string>
773773
<string name="down_left_arrow">freccia giù a sinistra</string>
774774
<string name="logo">logo</string>

0 commit comments

Comments
 (0)