Skip to content

Conversation

@kcw-grunt
Copy link
Collaborator

@kcw-grunt kcw-grunt commented Oct 9, 2025

πŸ“± Description

Platform

  • Android
  • iOS
  • Games-Unity
  • DevOps (AWS)
  • Website
  • C/Golang

🎯 Type of Change

  • πŸ› Bug fix
  • ✨ New feature
  • πŸ”§ Refactoring (code change that neither fixes a bug nor adds a feature)
  • πŸ“š Documentation update
  • 🎨 UI/UX improvement
  • ⚑ Performance improvement
  • πŸ§ͺ Test addition or improvement

πŸ“‹ Changes

πŸ”— Related Issues

  • Fixes #
  • Related to #

πŸ§ͺ Tests Status

  • Tests ran successfully locally?
  • Added more tests? How many?
  • Code coverage percentage of the codebase: __%

πŸ“Έ Screenshots/Videos

Before After

🎯 Reviewers

@kcw-grunt, @josikie

kcw-grunt and others added 30 commits March 30, 2025 10:50
πŸš€[Release v4.4.1] Merge into Develop
This reverts commit 4e252ac.

# Conflicts:
#	app/src/main/java/com/brainwallet/tools/manager/APIManager.kt
This reverts commit 4e252ac.

# Conflicts:
#	app/src/main/java/com/brainwallet/tools/manager/APIManager.kt
fix: race condition when clear shared prefs values after wipeAll
from the new peer discovery (v4.2.0)
* 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
- f2fa8e1
- 98644c4
- 9396927
- 7ad4b98
- 8e57d2a

* 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]>
JosephSanjaya and others added 12 commits August 30, 2025 11:33
The Indonesian language code "in" is normalized to "id" in `MessagingTopicDataSource`
to align with the ISO 639-1 standard used by the backend.

This ensures consistency in topic generation for Indonesian language users.
Tests have been added to verify this normalization for both "in" and "in_ID" inputs.
* feat: integrate build logic submodule

Integrates the `gruntsoftware-build-logic` Git submodule into the project.

This change includes:
- Adding the submodule to `.gitmodules`.
- Including the build logic in `settings.gradle.kts`.
- Applying build logic plugins (`test` and `detekt`) in `app/build.gradle.kts`.

* chore(detekt): apply baseline rules

* chore: Remove ktlint from project

This commit removes the ktlint configuration and associated tasks from the `app/build.gradle.kts` file. It also removes the `pinterest-ktlint` dependency from the `gradle/libs.versions.toml` file.
* Fixed the Git Submodule references

* updated gitmodules config

* create private gp submodule

* Update settings.gradle.kts

* chore: Migrate build logic to version catalog and update submodules

This commit migrates the project's build logic to use a centralized version catalog (`grunt`) and updates submodule references.

Specific changes include:

*   **Submodule Updates:**
    *   Updated `gruntsoftware-build-logic` submodule pointer.
    *   Updated `modules/private-general-purpose` submodule pointer.
*   **Build Configuration (`settings.gradle.kts`):**
    *   Removed the conditional loading of the `games` version catalog.
    *   Added a `grunt` version catalog loaded from `gruntsoftware-build-logic/gradle/libs.versions.toml`.
    *   Changed the included module from `:modules:private-general-purpose:content` to `:modules:private-general-purpose:games`.
    *   Removed conditional inclusion logic for `:modules:private-general-purpose:content`.
*   **Root `build.gradle.kts`:**
    *   Updated plugin aliases from `libs.plugins.android.*` to `grunt.plugins.android.*`.
*   **App `build.gradle.kts`:**
    *   Updated plugin alias for `com.android.application` from `libs` to `grunt`.
    *   Updated the `games` module dependency to `implementation(project(":modules:private-general-purpose:games"))` and removed the conditional logic for `findProject(":modules:games:content")`.
    *   Updated various dependencies to use the `grunt` version catalog (e.g., `grunt.androidx.core.ktx`, `grunt.androidx.compose.bom`, `grunt.bundles.androidx.compose`, `grunt.material`).
*   **Version Catalog (`gradle/libs.versions.toml`):**
    *   Removed versions for `agp` and `androidx-core-ktx`.
    *   Removed versions for `androidx-compose-bom`, `androidx-activity-compose`, and `androidx-fragment-compose`.
    *   Removed `androidx-core` library alias.
    *   Removed various `androidx-compose` library aliases and the `androidx-compose` bundle.
    *   Removed `android-application` and `android-library` plugin aliases.

* ci: Configure GitHub token for submodules in CircleCI

This commit updates the CircleCI configuration to include a step that configures a GitHub token. This token will be used for authenticating access to submodules during the build process.

* refactor: Update module paths for 'games'

This commit refactors the project structure by moving the 'games' module.
- The 'games' module path in `settings.gradle.kts` is changed from `:modules:private-general-purpose:games` to `:games` and its `projectDir` is set to `modules/private-general-purpose/games`.
- The dependency path in `app/build.gradle.kts` for the 'games' module is updated from `project(":modules:private-general-purpose:games")` to `project(":games")`.

The submodule references for `gruntsoftware-build-logic` and `modules/private-general-purpose` were also updated.

---------

Co-authored-by: Joseph Sanjaya <[email protected]>
This commit migrates the project's build logic to use a centralized version catalog (`grunt`) and updates submodule references.

Specific changes include:

*   **Submodule Updates:**
    *   Updated `gruntsoftware-build-logic` submodule pointer.
    *   Updated `modules/private-general-purpose` submodule pointer.
*   **Build Configuration (`settings.gradle.kts`):**
    *   Removed the conditional loading of the `games` version catalog.
    *   Added a `grunt` version catalog loaded from `gruntsoftware-build-logic/gradle/libs.versions.toml`.
    *   Changed the included module from `:modules:private-general-purpose:content` to `:modules:private-general-purpose:games`.
    *   Removed conditional inclusion logic for `:modules:private-general-purpose:content`.
*   **Root `build.gradle.kts`:**
    *   Updated plugin aliases from `libs.plugins.android.*` to `grunt.plugins.android.*`.
*   **App `build.gradle.kts`:**
    *   Updated plugin alias for `com.android.application` from `libs` to `grunt`.
    *   Updated the `games` module dependency to `implementation(project(":modules:private-general-purpose:games"))` and removed the conditional logic for `findProject(":modules:games:content")`.
    *   Updated various dependencies to use the `grunt` version catalog (e.g., `grunt.androidx.core.ktx`, `grunt.androidx.compose.bom`, `grunt.bundles.androidx.compose`, `grunt.material`).
*   **Version Catalog (`gradle/libs.versions.toml`):**
    *   Removed versions for `agp` and `androidx-core-ktx`.
    *   Removed versions for `androidx-compose-bom`, `androidx-activity-compose`, and `androidx-fragment-compose`.
    *   Removed `androidx-core` library alias.
    *   Removed various `androidx-compose` library aliases and the `androidx-compose` bundle.
    *   Removed `android-application` and `android-library` plugin aliases.
This commit adds the `kotlinx-collections-immutable` library, version 0.4.0, to the project's dependencies.
Updates the import paths for the core presentation module from `ltd.grunt.brainwallet.core.presentation` to `com.grunt.brainwallet.core.presentation`. This refactoring touches multiple UI components and initializers across the `app` module to align with the new package structure.

Additionally, this commit corrects a typo in `SeedWordItem.kt`, changing the error color variable from `chilli` to `chili` to match the theme definition.

Finally, the submodule pointer for `private-general-purpose` is updated.
feat(export-transactions): implement in-app purchase
@kcw-grunt kcw-grunt marked this pull request as ready for review October 9, 2025 20:47
@kcw-grunt kcw-grunt marked this pull request as draft October 9, 2025 20:47
@kcw-grunt kcw-grunt self-assigned this Oct 9, 2025
@kcw-grunt
Copy link
Collaborator Author

kcw-grunt commented Oct 9, 2025

@JosephSanjaya :
I think the git cache for the brach was corrupted somehow. CircleCi is looking for the old games module.
Can I get a helping hand to look at the issue?

. ERROR
Submodule 'app/src/main/secp/secp256k1' (https://****************************************@github.com/bitcoin-core/secp256k1.git) registered for path 'app/src/main/secp/secp256k1'
Submodule 'gruntsoftware-build-logic' (https://****************************************@github.com/gruntsoftware/*******-build-logic.git) registered for path 'gruntsoftware-build-logic'
fatal: No url found for submodule path 'modules/games' in .gitmodules

Exited with code exit status 128

@JosephSanjaya
Copy link
Collaborator

Syre let me take a look

@JosephSanjaya
Copy link
Collaborator

Done @kcw-grunt, i see there's still package submodules that supposed to be deleted games, remove it now its green

@kcw-grunt kcw-grunt marked this pull request as ready for review October 10, 2025 07:19
@kcw-grunt
Copy link
Collaborator Author

This version is approved by the Play Store.

Copy link
Collaborator

@josikie josikie left a comment

Choose a reason for hiding this comment

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

Awesome, thank you! @kcw-grunt

@kcw-grunt
Copy link
Collaborator Author

kcw-grunt commented Oct 12, 2025

Awesome, thank you! @kcw-grunt

Thanks for the look @josikie
And thanks for the Release notes @JosephSanjaya

@kcw-grunt
Copy link
Collaborator Author

Play Store approved

@kcw-grunt kcw-grunt merged commit 11df494 into main Oct 12, 2025
2 checks passed
@josikie
Copy link
Collaborator

josikie commented Oct 13, 2025

My pleasure @kcw-grunt

@kcw-grunt kcw-grunt deleted the release/v4.8.0 branch October 13, 2025 12:55
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants