Add wallet setup scene for name and avatar selection #1531

DRadmir · 2025-12-24T12:57:02Z

Introduce SetupWalletScene shown after wallet creation and import flows,
allowing users to set wallet name and select avatar (emoji/NFT image).

Add SetupWalletScene and SetupWalletViewModel for unified wallet setup
Move WalletAvatar components from ManageWallets to Onboarding package
Create CreateWalletModel and ImportWalletViewModel for navigation logic
Rename CreteWalletViewModel to NewSecretPhraseViewModel
Rename ImportWalletViewModel to ImportWalletSceneViewModel
Remove name field from ImportWalletScene (now in SetupWalletScene)
Pass avatarService through RootSceneViewModel instead of Environment
Update WalletService.importWallet to accept Wallet parameter

Screencast

https://github.com/user-attachments/assets/a4203dae-dae2-4efa-9701-9655229c2464
https://github.com/user-attachments/assets/353d696a-4d55-4206-82fb-ef36b20e07cf

TODO

Test
UI tests after approval flow

Close: #1517

gemini-code-assist · 2025-12-24T12:57:33Z

Summary of Changes

Hello @DRadmir, I'm Gemini Code Assist¹! I'm currently reviewing this pull request and will post my feedback shortly. In the meantime, here's a summary to help you and other reviewers quickly get up to speed!

This pull request significantly overhauls the wallet onboarding experience by introducing a dedicated setup scene for new and imported wallets. This change centralizes the process of naming a wallet and selecting its avatar, which was previously scattered across different flows. The underlying navigation logic for both creating and importing wallets has been consolidated into new, purpose-built view models, improving modularity and maintainability. These changes aim to provide a more consistent and user-friendly initial setup for all wallets.

Highlights

Unified Wallet Setup Scene: Introduced a new SetupWalletScene that appears after both wallet creation and import flows, allowing users to set a wallet name and select an avatar (emoji or NFT image) in a centralized location.
Refactored Wallet Creation/Import Flows: The wallet creation and import navigation stacks (CreateWalletNavigationStack and ImportWalletNavigationStack) have been refactored to use new dedicated models (CreateWalletModel and ImportWalletViewModel) that encapsulate navigation logic and callbacks, streamlining the onboarding process.
Component Relocation and Renaming: Several WalletAvatar components (scenes, view models, views) were moved from the ManageWallets feature to the Onboarding package. Additionally, CreateWalletViewModel was renamed to NewSecretPhraseViewModel and ImportWalletViewModel to ImportWalletSceneViewModel to better reflect their specific roles within the new flow.
Wallet Service API Update: The WalletService.importWallet method was updated to accept a Wallet object directly, and a new public loadOrCreateWallet method was introduced, providing more granular control over wallet management.
Conditional Name Field in Import: The name input field in the ImportWalletScene is now conditionally displayed only if there are no existing wallets, as the primary wallet naming is handled in the new SetupWalletScene.

🧠 New Feature in Public Preview: You can now enable Memory to help Gemini Code Assist learn from your team's feedback. This makes future code reviews more consistent and personalized to your project's style. Click here to enable Memory in your admin console.

Using Gemini Code Assist

The full guide for Gemini Code Assist can be found on our documentation page, here are some quick tips.

Invoking Gemini

You can request assistance from Gemini at any point by creating a comment using either /gemini <command> or @gemini-code-assist <command>. Below is a summary of the supported commands on the current page.

Feature	Command	Description
Code Review	`/gemini review`	Performs a code review for the current pull request in its current state.
Pull Request Summary	`/gemini summary`	Provides a summary of the current pull request in its current state.
Comment	@gemini-code-assist	Responds in comments when explicitly tagged, both in pull request comments and review comments.
Help	`/gemini help`	Displays a list of available commands.

Customization

To customize Gemini Code Assist for GitHub experience, repository maintainers can create a configuration file and/or provide a custom code review style guide (such as PEP-8 for Python) by creating and adding files to a .gemini/ folder in the base of the repository. Detailed instructions can be found here.

Limitations & Feedback

Gemini Code Assist may make mistakes. Please leave feedback on any instances where its feedback is incorrect or counter productive. You can react with 👍 and 👎 on @gemini-code-assist comments. If you're interested in giving your feedback about your experience with Gemini Code Assist for Github and other Google products, sign up here.

You can also get AI-powered code generation, chat, as well as code reviews directly in the IDE at no cost with the Gemini Code Assist IDE Extension.

Review the Privacy Notices, Generative AI Prohibited Use Policy, Terms of Service, and learn how to configure Gemini Code Assist in GitHub here. Gemini can make mistakes, so double check it and use code with caution. ↩

gemini-code-assist

Code Review

This pull request introduces a new wallet setup scene for setting the name and avatar, which is a great addition to the onboarding flow. The refactoring to introduce CreateWalletModel and ImportWalletViewModel to handle navigation logic is a significant improvement for code structure and testability. I've provided a few suggestions to improve performance by debouncing database writes and to reduce code duplication in the new models. Overall, this is a well-structured PR with significant positive changes.

Features/Onboarding/Sources/ViewModels/SetupWalletViewModel.swift

Features/Onboarding/Sources/ViewModels/CreateWalletModel.swift

Features/Onboarding/Sources/Types/ImportWalletViewModel.swift

Introduce SetupWalletScene shown after wallet creation and import flows, allowing users to set wallet name and select avatar (emoji/NFT image). - Add SetupWalletScene and SetupWalletViewModel for unified wallet setup - Move WalletAvatar components from ManageWallets to Onboarding package - Create CreateWalletModel and ImportWalletViewModel for navigation logic - Rename CreteWalletViewModel to NewSecretPhraseViewModel - Rename ImportWalletViewModel to ImportWalletSceneViewModel - Remove name field from ImportWalletScene (now in SetupWalletScene) - Pass avatarService through RootSceneViewModel instead of Environment - Update WalletService.importWallet to accept Wallet parameter

…ability-to-name-and-select-image-for-new-wallet

Features/Onboarding/Sources/ViewModels/ImportWalletViewModel.swift

Replaces usage of Localized.Wallet.walletName with Localized.Wallet.name in SetupWalletScene and removes the unused walletName key from all localization files and the Localized.swift enum. Also updates SetupWalletViewModel to use the correct import wallet title localization.

- Present WalletImageScene as modal sheet instead of push navigation - Move navigationPath from ViewModels to NavigationStack scenes - Split async wallet creation methods for better separation - Move hasExistingWallets check to scene layer

gemcoder21 · 2025-12-26T18:15:18Z

Features/Onboarding/Sources/ViewModels/CreateWalletModel.swift

+    }
+
+    func createWallet(words: [String]) async throws -> Wallet {
+        let wallet = try await walletService.loadOrCreateWallet(


since we added a new step, should we drop user to the wallet instead of showing wallet configuration screen?

We decided to keep the wallet configuration screen, since we can load assets in the background while the user is setting the wallet name and icon

gemcoder21 · 2025-12-26T18:15:45Z

Features/Onboarding/Sources/ViewModels/ImportWalletSceneViewModel.swift

                return RecipientImport(name: result.name, address: result.address)
            }
-            return RecipientImport(name: name, address: input)
+            let walletName = name.isEmpty ? WalletNameGenerator(type: type, walletService: walletService).name : name


can you add unit test for this name.isEmpty ? WalletNameGenerator(type: type, walletService: walletService).name : name

gemcoder21 · 2025-12-26T18:17:12Z

Features/Onboarding/Package.swift

        .package(name: "FeatureServices", path: "../../Packages/FeatureServices"),
-        .package(name: "ChainServices", path: "../../Packages/ChainServices")
+        .package(name: "ChainServices", path: "../../Packages/ChainServices"),
+        .package(name: "Store", path: "../../Packages/Store")


can we avoid importing Store ? and use services instead

Store is required for WalletRequest

Refactored CreateWalletUITests and ImportWalletReceiveBitcoinUITests to use reusable flow functions for wallet creation and import, improving readability and maintainability. Added utility methods to XCUIApplication extension for tapping wallet actions. Updated ImportWalletViewModel to store hasExistingWallets as a property. Added a second test mnemonic to UITestKitConstants for multi-wallet scenarios.

Updated several localized strings in Localized.swift and multiple language resource files to remove Markdown-style bold formatting (e.g., **%@**) from user-facing messages. This change ensures consistency and avoids rendering issues in UI components that do not support Markdown.

…ability-to-name-and-select-image-for-new-wallet # Conflicts: # Gem/App.swift # Gem/ViewModels/RootSceneViewModel.swift

DRadmir self-assigned this Dec 24, 2025

gemini-code-assist bot reviewed Dec 24, 2025

View reviewed changes

Features/Onboarding/Sources/ViewModels/SetupWalletViewModel.swift Show resolved Hide resolved

Features/Onboarding/Sources/ViewModels/CreateWalletModel.swift Outdated Show resolved Hide resolved

Features/Onboarding/Sources/Types/ImportWalletViewModel.swift Outdated Show resolved Hide resolved

DRadmir force-pushed the 1517-add-ability-to-name-and-select-image-for-new-wallet branch 3 times, most recently from 31ede2c to f8563d6 Compare December 24, 2025 17:01

DRadmir force-pushed the 1517-add-ability-to-name-and-select-image-for-new-wallet branch from f8563d6 to 2bcc138 Compare December 24, 2025 18:46

DRadmir added 2 commits December 25, 2025 10:40

Fix avatar blinking on wallet removal

3935632

Merge branch 'main' of github.com:gemwalletcom/gem-ios into 1517-add-…

e00ca46

…ability-to-name-and-select-image-for-new-wallet

DRadmir requested review from gemcoder21 and gemdev111 December 25, 2025 06:10

DRadmir marked this pull request as ready for review December 25, 2025 06:10

gemdev111 reviewed Dec 25, 2025

View reviewed changes

Features/Onboarding/Sources/ViewModels/ImportWalletViewModel.swift Outdated Show resolved Hide resolved

gemdev111 approved these changes Dec 25, 2025

View reviewed changes

DRadmir added 2 commits December 26, 2025 13:35

gemcoder21 reviewed Dec 26, 2025

View reviewed changes

gemcoder21 approved these changes Dec 26, 2025

View reviewed changes

DRadmir added 3 commits December 27, 2025 00:38

Merge branch 'main' of github.com:gemwalletcom/gem-ios into 1517-add-…

a399cfa

…ability-to-name-and-select-image-for-new-wallet # Conflicts: # Gem/App.swift # Gem/ViewModels/RootSceneViewModel.swift

DRadmir merged commit 77a2c91 into main Dec 26, 2025
3 checks passed

DRadmir deleted the 1517-add-ability-to-name-and-select-image-for-new-wallet branch December 26, 2025 21:14

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Add wallet setup scene for name and avatar selection #1531

Add wallet setup scene for name and avatar selection #1531

Uh oh!

DRadmir commented Dec 24, 2025 •

edited

Loading

Uh oh!

gemini-code-assist bot commented Dec 24, 2025

Uh oh!

gemini-code-assist bot left a comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gemcoder21 Dec 26, 2025

Uh oh!

DRadmir Dec 26, 2025

Uh oh!

gemcoder21 Dec 26, 2025

Uh oh!

gemcoder21 Dec 26, 2025

Uh oh!

DRadmir Dec 26, 2025

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

Add wallet setup scene for name and avatar selection #1531

Add wallet setup scene for name and avatar selection #1531

Uh oh!

Conversation

DRadmir commented Dec 24, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Screencast

TODO

Uh oh!

gemini-code-assist bot commented Dec 24, 2025

Summary of Changes

Highlights

Footnotes

Uh oh!

gemini-code-assist bot left a comment

Choose a reason for hiding this comment

Code Review

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

gemcoder21 Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

DRadmir Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

gemcoder21 Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

gemcoder21 Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

DRadmir Dec 26, 2025

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

4 participants

DRadmir commented Dec 24, 2025 •

edited

Loading